mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-08-30 07:22:05 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1463 from armchair-philosophy/up_templates_arch

Browse Source 
[templates] archlinux: resolve conflicting files
This commit is contained in:
Stéphane Graber 2017-03-14 20:47:21 -04:00 committed by GitHub
commit bb2f438985
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/lxc-archlinux.in
View File

@ -42,7 +42,6 @@ export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
arch=$(uname -m)
default_path="@LXCPATH@"
default_locale="en-US.UTF-8"
default_timezone="UTC"
pacman_config="/etc/pacman.conf"
common_config="@LXCTEMPLATECONFIG@/common.conf"
shared_config="@LXCTEMPLATECONFIG@/archlinux.common.conf"
@ -87,9 +86,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 +100,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