diff options
| author | Michael Stapelberg <stapelberg@debian.org> | 2013-03-21 00:37:47 +0100 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-03-20 20:03:30 -0400 |
| commit | 296d1304d0efac6c22dcd11d96fa127f55050c12 (patch) | |
| tree | f824c3c32958233117ce0b88b67c2e22b47b12c5 | |
| parent | 2cef6101c02593ca5a948a286313e93b1142cf53 (diff) | |
systemd: update check to look for /run/systemd/system
The old check (for /sys/fs/cgroup/systemd) is a false-positive on
systems which use standalone logind, but not systemd.
The new one is recommended and used by upstream systemd in their
sd_booted() implementation, see
http://cgit.freedesktop.org/systemd/systemd/tree/src/libsystemd-daemon/sd-daemon.c#n518
| -rw-r--r-- | autoscripts/postinst-init-nostart | 2 | ||||
| -rw-r--r-- | autoscripts/postinst-init-restart | 2 | ||||
| -rw-r--r-- | autoscripts/postinst-init-tmpfiles | 2 | ||||
| -rw-r--r-- | autoscripts/postrm-init | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/autoscripts/postinst-init-nostart b/autoscripts/postinst-init-nostart index ec6bdbd6..6ccb4830 100644 --- a/autoscripts/postinst-init-nostart +++ b/autoscripts/postinst-init-nostart @@ -1,7 +1,7 @@ if [ -x "/etc/init.d/#SCRIPT#" ]; then # In case this system is running systemd, we need to ensure that all # necessary tmpfiles (if any) are created before starting. - if [ -d /sys/fs/cgroup/systemd ] ; then + if [ -d /run/systemd/system ] ; then systemd-tmpfiles --create >/dev/null || true fi diff --git a/autoscripts/postinst-init-restart b/autoscripts/postinst-init-restart index 862f9cc3..d27cc8dc 100644 --- a/autoscripts/postinst-init-restart +++ b/autoscripts/postinst-init-restart @@ -1,7 +1,7 @@ if [ -x "/etc/init.d/#SCRIPT#" ]; then # In case this system is running systemd, we need to ensure that all # necessary tmpfiles (if any) are created before starting. - if [ -d /sys/fs/cgroup/systemd ] ; then + if [ -d /run/systemd/system ] ; then systemd-tmpfiles --create >/dev/null || true fi diff --git a/autoscripts/postinst-init-tmpfiles b/autoscripts/postinst-init-tmpfiles index 41f738a9..e6cb7853 100644 --- a/autoscripts/postinst-init-tmpfiles +++ b/autoscripts/postinst-init-tmpfiles @@ -1,5 +1,5 @@ # In case this system is running systemd, we need to ensure that all # necessary tmpfiles (if any) are created before starting. -if [ -d /sys/fs/cgroup/systemd ] ; then +if [ -d /run/systemd/system ] ; then systemd-tmpfiles --create >/dev/null || true fi diff --git a/autoscripts/postrm-init b/autoscripts/postrm-init index 61dcfc53..6f5bb09a 100644 --- a/autoscripts/postrm-init +++ b/autoscripts/postrm-init @@ -5,6 +5,6 @@ fi # In case this system is running systemd, we make systemd reload the unit files # to pick up changes. -if [ -d /sys/fs/cgroup/systemd ] ; then +if [ -d /run/systemd/system ] ; then systemctl --system daemon-reload >/dev/null || true fi |