Merge pull request #1162 from brauner/2016-08-31/remove_halt_symlink

templates: rm halt.target -> sigpwr.target symlink
This commit is contained in:
Stéphane Graber 2016-08-31 18:29:32 -04:00 committed by GitHub
commit 1f42bbcec5
2 changed files with 0 additions and 5 deletions

View File

@ -256,8 +256,6 @@ configure_debian_systemd()
chroot "${rootfs}" ln -s /dev/null /etc/systemd/system/udev.service
chroot "${rootfs}" ln -s /dev/null /etc/systemd/system/systemd-udevd.service
chroot "${rootfs}" ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
# Make systemd honor SIGPWR
chroot "${rootfs}" ln -s /lib/systemd/system/halt.target /etc/systemd/system/sigpwr.target
# Setup getty service on the ttys we are going to allow in the
# default config. Number should match lxc.tty
( cd "${rootfs}/etc/systemd/system/getty.target.wants"

View File

@ -169,9 +169,6 @@ EOF
rm -f $container_rootfs/usr/lib/systemd/system/sysinit.target.wants/kmod-static-nodes.service
chroot $container_rootfs systemctl -q disable graphical.target
chroot $container_rootfs systemctl -q enable multi-user.target
if [ ! -e $container_rootfs/etc/systemd/system/sigpwr.target ]; then
chroot $container_rootfs ln -s /usr/lib/systemd/system/halt.target /etc/systemd/system/sigpwr.target
fi
# systemd in userns won't be able to set /proc/self/oom_score_adj which
# prevents the dbus service from starting