[arch-commits] Commit in systemd/trunk (PKGBUILD systemd-hook)

[Christian Hesse]

    Date: Friday, March 9, 2018 @ 07:36:04
  Author: eworm
Revision: 318292

do not print error if udevd is not running

Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd-hook

--------------+
 PKGBUILD     |    2 +-
 systemd-hook |   17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-09 06:56:28 UTC (rev 318291)
+++ PKGBUILD	2018-03-09 07:36:04 UTC (rev 318292)
@@ -49,7 +49,7 @@
             'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
             '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
             'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
-            '370d8c0fafc229607e968b884bbbcef426bef51fd0599bfca60717ffb6090e6206e90ca05f2cba835248ddb1f66c938f85515efc518cd24fb8d3ccc8bca4e065'
+            '462ed39bd5c90168079956a402abafe8f0910882e6876b165a2c27af73833d0cad1be9cdbcb3549b34652ea86e5d0dba044946a38797bd533fdd1f5a0083f63b'
             '46f93725bc94381300535737fd0186a3c096fa83661179eab0c450c7b164a87d9a5dd9abcf6ae98bdeb4bf50a4ba4f1944769948c236e4814f166ff03b0ee177'
             '4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb'
             '872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2'

Modified: systemd-hook
===================================================================
--- systemd-hook	2018-03-09 06:56:28 UTC (rev 318291)
+++ systemd-hook	2018-03-09 07:36:04 UTC (rev 318292)
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-only_live() {
+systemd_live() {
   if [ ! -d /run/systemd/system ]; then
     echo >&2 "  Skipped: Current root is not booted."
     exit 0
@@ -7,6 +7,13 @@
   fi
 }
 
+udevd_live() {
+  if [ ! -d /run/udev ]; then
+    echo >&2 "  Skipped: Device manager is not running."
+    exit 0
+  fi
+}
+
 each_conf() {
   while read -r f; do
     "$@" "$(basename "$f")"
@@ -20,10 +27,10 @@
   sysusers) each_conf /usr/bin/systemd-sysusers ;;
   tmpfiles) each_conf /usr/bin/systemd-tmpfiles --create ;;
 
-  daemon-reload) only_live; /usr/bin/systemctl daemon-reload ;;
-  udev-reload)   only_live; /usr/bin/udevadm control --reload ;;
-  binfmt)        only_live; each_conf /usr/lib/systemd/systemd-binfmt ;;
-  sysctl)        only_live; each_conf /usr/lib/systemd/systemd-sysctl ;;
+  daemon-reload) systemd_live; /usr/bin/systemctl daemon-reload ;;
+  udev-reload)   udevd_live;   /usr/bin/udevadm control --reload ;;
+  binfmt)        systemd_live; each_conf /usr/lib/systemd/systemd-binfmt ;;
+  sysctl)        systemd_live; each_conf /usr/lib/systemd/systemd-sysctl ;;
 
   *) echo >&2 "  Invalid operation '$1'"; exit 1 ;;
 esac