]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
lxc-fedora.in: Correct some systemd target setups.
authorMichael H. Warfield <mhw@WittsEnd.com>
Tue, 3 Jun 2014 16:59:20 +0000 (12:59 -0400)
committerStéphane Graber <stgraber@ubuntu.com>
Tue, 3 Jun 2014 19:06:35 +0000 (15:06 -0400)
Set the halt.target action to be sigpwr.target.  This allows
SIGPWR to properly shut the container down from lxc-stop.

Renable the systemd-journald.service.

Signed-off-by: Michael H. Warfield <mhw@WittsEnd.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
templates/lxc-fedora.in

index 2e14cc8845b9fe9b4a13b7bf99fed8df4e8b1faf..b9741ac3e28d95afac0e9d9ec8edfe0678c0a8a6 100644 (file)
@@ -369,10 +369,9 @@ configure_fedora_systemd()
     rm -f ${rootfs_path}/etc/systemd/system/default.target
     touch ${rootfs_path}/etc/fstab
     chroot ${rootfs_path} ln -s /dev/null /etc/systemd/system/udev.service
-    chroot ${rootfs_path} ln -s /dev/null /etc/systemd/system/systemd-journald.service
     chroot ${rootfs_path} ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
     # Make systemd honor SIGPWR
-    chroot ${rootfs_path} ln -s /usr/lib/systemd/system/halt.target /etc/systemd/system/
+    chroot ${rootfs_path} ln -s /usr/lib/systemd/system/halt.target /etc/systemd/system/sigpwr.target
     #dependency on a device unit fails it specially that we disabled udev
     # sed -i 's/After=dev-%i.device/After=/' ${rootfs_path}/lib/systemd/system/getty\@.service
     #