Skip to content

Commit

Permalink
[templates] archlinux: resolve conflicting files
Browse files Browse the repository at this point in the history
- already found /etc/localtime
- duplicate creation /etc/resolv.conf

Signed-off-by: otofune <otofune@gmail.com>
  • Loading branch information
otofune authored and stgraber committed Mar 20, 2017
1 parent c3d5285 commit f8bed24
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions templates/lxc-archlinux.in
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit f8bed24

Please sign in to comment.