Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages / 
systemd


Commits:
45b1d9a8 by Christian Hesse at 2025-09-18T15:50:42+02:00
systemd-hook: discard output from systemd-detect-virt

- - - - -
e455e0a6 by Christian Hesse at 2025-09-18T15:50:46+02:00
systemd-hook: use `systemctl is-system-running`...

... as `systemd-notify --booted` seems to be unreliable in
specific situations.

- - - - -
cff96194 by Christian Hesse at 2025-09-18T15:53:50+02:00
systemd-hook: introduce verb `restart`...

... to force restart for services that need a restart instead of reload.

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- systemd-hook


Changes:

=====================================
.SRCINFO
=====================================
@@ -83,7 +83,7 @@ pkgbase = systemd
        sha512sums = 
3194d1f8bff31b88a79657df83632b9224b66ca2cf8fd806a3ef35cf7a43f46c09c57f3dfd02256a99b6514a8f789b7d3bcfd7e17e00e34aa55ff0c6cedb5f01
        sha512sums = 
5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75
        sha512sums = 
32580b82e97573d3e499821e2ce415ff134c0ec52c9b44a3c0862c4007d347f55636d6afac3dfc6831a9b384c7448075bdf3a12f369b4d8b62b24dfdb9c8a76a
-       sha512sums = 
81baa1ae439b0f4d1f09371a82c02db06a97a4fc35545fc2654f7905b4422fc8cf085f70304919a4323f39e662df1e05aa8d977d1dde73507527abe3072c386b
+       sha512sums = 
16871d59ea56063131ea2e742f516c2303fdb6dbc37c1fd9d6b89974a3d6aa4073be0a6b79d569345a9fc7491eda76476b9b3ed7c5599b6afa443881f809d39b
        sha512sums = 
299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5
        sha512sums = 
0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7
        sha512sums = 
2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc


=====================================
PKGBUILD
=====================================
@@ -65,7 +65,7 @@ 
sha512sums=('4703b54464ae42acb9e8b2a123f9e76cbe94b03c416292a95b9a8eb282eb2908e04
             
'3194d1f8bff31b88a79657df83632b9224b66ca2cf8fd806a3ef35cf7a43f46c09c57f3dfd02256a99b6514a8f789b7d3bcfd7e17e00e34aa55ff0c6cedb5f01'
             
'5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
             
'32580b82e97573d3e499821e2ce415ff134c0ec52c9b44a3c0862c4007d347f55636d6afac3dfc6831a9b384c7448075bdf3a12f369b4d8b62b24dfdb9c8a76a'
-            
'81baa1ae439b0f4d1f09371a82c02db06a97a4fc35545fc2654f7905b4422fc8cf085f70304919a4323f39e662df1e05aa8d977d1dde73507527abe3072c386b'
+            
'16871d59ea56063131ea2e742f516c2303fdb6dbc37c1fd9d6b89974a3d6aa4073be0a6b79d569345a9fc7491eda76476b9b3ed7c5599b6afa443881f809d39b'
             
'299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5'
             
'0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7'
             
'2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc'


=====================================
systemd-hook
=====================================
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 skip_chrooted() {
-  if systemd-detect-virt --chroot; then
+  if systemd-detect-virt --chroot >/dev/null 2>&1; then
     echo >&2 "  Skipped: Running in chroot."
     exit 0
   fi
@@ -10,7 +10,7 @@ skip_chrooted() {
 systemd_live() {
   skip_chrooted
 
-  if ! systemd-notify --booted >/dev/null 2>&1; then
+  if ! systemctl is-system-running >/dev/null 2>&1; then
     echo >&2 "  Skipped: Current root is not booted."
     exit 0
   fi
@@ -80,6 +80,12 @@ case "$op" in
     /usr/bin/systemctl try-reload-or-restart "$@"
     ;;
 
+  # For use by other packages
+  restart)
+    systemd_live
+    /usr/bin/systemctl try-restart "$@"
+    ;;
+
   *)
     echo >&2 "  Invalid operation '$op'"
     exit 1



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/systemd/-/compare/cbf5531a7be72c6706b2538027f1c6fcf50ec98a...cff96194d33581aeb0db3d63275c6da7890f34e4

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/systemd/-/compare/cbf5531a7be72c6706b2538027f1c6fcf50ec98a...cff96194d33581aeb0db3d63275c6da7890f34e4
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to