From 1a95cafac8876ac9ecca2b671b69d9c81a4a4113 Mon Sep 17 00:00:00 2001
From: Thorsten Töpper <atsutane-aur@freethoughts.de>
Date: Wed, 4 Sep 2024 19:28:45 +0200
Subject: Fix version string generation & sync with core/systemd

---
 systemd-hook | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'systemd-hook')

diff --git a/systemd-hook b/systemd-hook
index 63f27e0..d64341f 100644
--- a/systemd-hook
+++ b/systemd-hook
@@ -26,14 +26,27 @@ udevd_live() {
 op="$1"; shift
 
 case "$op" in
+  binfmt)
+    systemd_live
+    /usr/lib/systemd/systemd-binfmt
+    ;;
   catalog)
     /usr/bin/journalctl --update-catalog
     ;;
+  daemon-reload-system)
+    systemd_live
+    /usr/bin/systemctl --system daemon-reload
+    ;;
+  daemon-reload-user)
+    systemd_live
+    /usr/bin/systemctl kill --kill-whom='main' --signal='SIGHUP' 'user@*.service'
+    ;;
   hwdb)
     /usr/bin/systemd-hwdb --usr update
     ;;
-  update)
-    touch -c /usr
+  sysctl)
+    systemd_live
+    /usr/lib/systemd/systemd-sysctl
     ;;
   sysusers)
     /usr/bin/systemd-sysusers
@@ -41,10 +54,8 @@ case "$op" in
   tmpfiles)
     /usr/bin/systemd-tmpfiles --create
     ;;
-
-  daemon-reload)
-    systemd_live
-    /usr/bin/systemctl daemon-reload
+  update)
+    touch -c /usr
     ;;
   udev-reload)
     udevd_live
@@ -54,14 +65,6 @@ case "$op" in
       /usr/bin/udevadm settle
     fi
     ;;
-  binfmt)
-    systemd_live
-    /usr/lib/systemd/systemd-binfmt
-    ;;
-  sysctl)
-    systemd_live
-    /usr/lib/systemd/systemd-sysctl
-    ;;
 
   # For use by other packages
   reload)
-- 
cgit v1.2.3-70-g09d2