Merge pull request #50 from ActiDoo/codex/investigate-testfailures-in-container-tests

Skip systemctl reload in packaging scripts when systemd inactive

Author: msander

docs/STATE.md

@@ -83,6 +83,10 @@
   the expected paths while gracefully skipping when no container runtime is
   available.  The harness now shares the host cgroup namespace so systemd boots
   reliably on modern cgroup v2 hosts.
+- Maintainer scripts now confirm a live systemd control socket exists before
+  attempting to reload units, suppressing noisy failures when packages are
+  installed into containers or chroots without an active init system while
+  preserving the reload behaviour on real hosts.
 - A top-level `Makefile` now standardises local builds, cross-compilation for
   `amd64`/`arm64`, and wraps `nfpm` so developers can reproducibly stage
   binaries in `dist/` and generate `.deb`/`.rpm` packages without ad-hoc

packaging/scripts/deb/postinst

@@ -4,7 +4,15 @@ set -eu
 TMPFILES_CONF="/usr/lib/tmpfiles.d/clusterrebootd.conf"
 
 systemd_active() {
-  [ -d /run/systemd/system ] && command -v systemctl >/dev/null 2>&1
+  if ! command -v systemctl >/dev/null 2>&1; then
+    return 1
+  fi
+
+  if [ ! -S /run/systemd/private ]; then
+    return 1
+  fi
+
+  return 0
 }
 
 case "$1" in

packaging/scripts/deb/postrm

@@ -2,7 +2,15 @@
 set -eu
 
 systemd_active() {
-  [ -d /run/systemd/system ] && command -v systemctl >/dev/null 2>&1
+  if ! command -v systemctl >/dev/null 2>&1; then
+    return 1
+  fi
+
+  if [ ! -S /run/systemd/private ]; then
+    return 1
+  fi
+
+  return 0
 }
 
 case "$1" in

packaging/scripts/deb/prerm

@@ -2,7 +2,15 @@
 set -eu
 
 systemd_active() {
-  [ -d /run/systemd/system ] && command -v systemctl >/dev/null 2>&1
+  if ! command -v systemctl >/dev/null 2>&1; then
+    return 1
+  fi
+
+  if [ ! -S /run/systemd/private ]; then
+    return 1
+  fi
+
+  return 0
 }
 
 case "$1" in

packaging/scripts/rpm/postinstall.sh

@@ -4,7 +4,15 @@ set -eu
 TMPFILES_CONF="/usr/lib/tmpfiles.d/clusterrebootd.conf"
 
 systemd_active() {
-  [ -d /run/systemd/system ] && command -v systemctl >/dev/null 2>&1
+  if ! command -v systemctl >/dev/null 2>&1; then
+    return 1
+  fi
+
+  if [ ! -S /run/systemd/private ]; then
+    return 1
+  fi
+
+  return 0
 }
 
 if [ "$1" -ge 1 ]; then

packaging/scripts/rpm/postremove.sh

@@ -2,7 +2,15 @@
 set -eu
 
 systemd_active() {
-  [ -d /run/systemd/system ] && command -v systemctl >/dev/null 2>&1
+  if ! command -v systemctl >/dev/null 2>&1; then
+    return 1
+  fi
+
+  if [ ! -S /run/systemd/private ]; then
+    return 1
+  fi
+
+  return 0
 }
 
 if [ "$1" -eq 0 ]; then

packaging/scripts/rpm/preremove.sh

@@ -2,7 +2,15 @@
 set -eu
 
 systemd_active() {
-  [ -d /run/systemd/system ] && command -v systemctl >/dev/null 2>&1
+  if ! command -v systemctl >/dev/null 2>&1; then
+    return 1
+  fi
+
+  if [ ! -S /run/systemd/private ]; then
+    return 1
+  fi
+
+  return 0
 }
 
 if [ "$1" -eq 0 ]; then