From: otofune <otofune@gmail.com>
Date: Wed, 15 Mar 2017 00:09:17 +0000 (+0900)
Subject: [templates] archlinux: resolve conflicting files
X-Git-Tag: lxc-2.1.0~180^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=349fadd6e328c0cfb7e04d4eb2e9ae83ccedf69f;p=thirdparty%2Flxc.git

[templates] archlinux: resolve conflicting files

- already found /etc/localtime
- duplicate creation /etc/resolv.conf

Signed-off-by: otofune <otofune@gmail.com>
---

diff --git a/templates/lxc-archlinux.in b/templates/lxc-archlinux.in
index c52459d70..def13b859 100644
--- a/templates/lxc-archlinux.in
+++ b/templates/lxc-archlinux.in
@@ -87,9 +87,6 @@ configure_arch() {
 
     # hostname and nameservers
     echo "${name}" > "${rootfs_path}/etc/hostname"
-    while read r; do
-       [ "${r#nameserver}" = "$r" ] || echo "$r"
-    done < /etc/resolv.conf > "${rootfs_path}/etc/resolv.conf"
 
     # network configuration
     cat > "${rootfs_path}/etc/systemd/network/eth0.network" << EOF
@@ -104,7 +101,6 @@ EOF
     arch-chroot "${rootfs_path}" /bin/bash -s << EOF
 mkdir /run/lock
 locale-gen
-ln -s /usr/share/zoneinfo/${default_timezone} /etc/localtime
 # set default boot target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 # override getty@.service for container ttys