Skip to content

L
lxc
Unverified Commit f8bed24c by otofune Committed by Stéphane Graber
Options

[templates] archlinux: resolve conflicting files

- already found /etc/localtime - duplicate creation /etc/resolv.conf Signed-off-by: 's avatarotofune <otofune@gmail.com>
parent c3d52854
Showing with 0 additions and 4 deletions
templates/lxc-archlinux.in
...@@ -87,9 +87,6 @@ configure_arch() { ...@@ -87,9 +87,6 @@ configure_arch() {
# hostname and nameservers # hostname and nameservers
echo "${name}" > "${rootfs_path}/etc/hostname" 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 # network configuration
cat > "${rootfs_path}/etc/systemd/network/eth0.network" << EOF cat > "${rootfs_path}/etc/systemd/network/eth0.network" << EOF
...@@ -104,7 +101,6 @@ EOF ...@@ -104,7 +101,6 @@ EOF
arch-chroot "${rootfs_path}" /bin/bash -s << EOF arch-chroot "${rootfs_path}" /bin/bash -s << EOF
mkdir /run/lock mkdir /run/lock
locale-gen locale-gen
ln -s /usr/share/zoneinfo/${default_timezone} /etc/localtime
# set default boot target # set default boot target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
# override getty@.service for container ttys # override getty@.service for container ttys
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment