]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
[templates] archlinux: resolve conflicting files
authorotofune <otofune@gmail.com>
Wed, 15 Mar 2017 00:09:17 +0000 (09:09 +0900)
committerotofune <otofune@gmail.com>
Wed, 15 Mar 2017 00:17:07 +0000 (09:17 +0900)
- already found /etc/localtime
- duplicate creation /etc/resolv.conf

Signed-off-by: otofune <otofune@gmail.com>
templates/lxc-archlinux.in

index c52459d7011dba429f34e95ab45f2610be7b13ad..def13b85984d255882ac6a1b85a5af5f5fe4ad51 100644 (file)
@@ -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