[lxc-devel] [lxc/master] templates: rm halt.target -> sigpwr.target symlink

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 673 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20160831/149b157e/attachment.bin>
-------------- next part --------------
From 8eb62c245e9b67b451ba0766f3ecd7c6f2081d73 Mon Sep 17 00:00:00 2001
From: Christian Brauner <cbrauner at suse.de>
Date: Wed, 31 Aug 2016 23:53:50 +0200
Subject: [PATCH] templates: rm halt.target -> sigpwr.target symlink

Given commit 330ae3d350e060e5702a0e5ef5d0faeeeea8df6e:

    lxccontainer: detect if we should send SIGRTMIN+3

    This is required by systemd to cleanly shutdown. Other init systems should not
    have SIGRTMIN+3 in the blocked signals set.

we should stop symlinking halt.target to sigpwr.target for systemd.

Signed-off-by: Christian Brauner <cbrauner at suse.de>
---
 templates/lxc-debian.in | 2 --
 templates/lxc-oracle.in | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
index 18d8422..e5ad10d 100644
--- a/templates/lxc-debian.in
+++ b/templates/lxc-debian.in
@@ -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"
diff --git a/templates/lxc-oracle.in b/templates/lxc-oracle.in
index eb01ecb..20c212b 100644
--- a/templates/lxc-oracle.in
+++ b/templates/lxc-oracle.in
@@ -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