[lxc-devel] [lxc/master] [templates] archlinux: resolve conflicting files

[armchair-philosophy on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 370 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20170315/b5c8d731/attachment.bin>
-------------- next part --------------
From a339f65e5e20b879f80802f1395139da2b78da07 Mon Sep 17 00:00:00 2001
From: otofune <otofune at gmail.com>
Date: Wed, 15 Mar 2017 09:09:17 +0900
Subject: [PATCH] [templates] archlinux: resolve conflicting files

- already found /etc/localtime
- duplicate creation /etc/resolv.conf
---
 templates/lxc-archlinux.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/templates/lxc-archlinux.in b/templates/lxc-archlinux.in
index c52459d..def13b8 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 at .service for container ttys