From 89aa08197f821ae64ea939243b31edb3c9e6611f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 10 Apr 2019 23:07:52 +0200
Subject: [PATCH] Make scriptlets non-failing and skip udevadm reload if no
 udev

sysctl, binfmt, and other rules are collected from multiple packages
and we don't want to see a report that systemd %triggerin failed.
So let's not silence the output, but use "|| :" to the trigger is
not reported as failed.

Also, adjust the udevadm check. In containers udevd might not be
running, even if systemd is, and we'd get:
Failed to send reload request: No such file or directory

https://bugzilla.redhat.com/show_bug.cgi?id=1698391
---
 triggers.systemd | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/triggers.systemd b/triggers.systemd
index 90906e3..7a7e792 100644
--- a/triggers.systemd
+++ b/triggers.systemd
@@ -62,7 +62,7 @@ fi
 # specified users automatically. The priority is set such that it
 # will run before the tmpfiles file trigger.
 if test -d /run/systemd/system; then
-  %{_bindir}/systemd-sysusers
+  %{_bindir}/systemd-sysusers || :
 fi
 
 %transfiletriggerin -P 100500 -- /usr/lib/tmpfiles.d
@@ -70,35 +70,35 @@ fi
 # tmpfiles automatically. The priority is set such that it will run
 # after the sysusers file trigger, but before any other triggers.
 if test -d /run/systemd/system; then
-  %{_bindir}/systemd-tmpfiles --create
+  %{_bindir}/systemd-tmpfiles --create || :
 fi
 
 %transfiletriggerin udev -- /usr/lib/udev/hwdb.d
 # This script will automatically invoke hwdb update if files have been
 # installed or updated in /usr/lib/udev/hwdb.d.
 if test -d /run/systemd/system; then
-  %{_bindir}/systemd-hwdb update
+  %{_bindir}/systemd-hwdb update || :
 fi
 
 %transfiletriggerin -- /usr/lib/systemd/catalog
 # This script will automatically invoke journal catalog update if files
 # have been installed or updated in /usr/lib/systemd/catalog.
 if test -d /run/systemd/system; then
-  %{_bindir}/journalctl --update-catalog
+  %{_bindir}/journalctl --update-catalog || :
 fi
 
 %transfiletriggerin udev -- /usr/lib/udev/rules.d
 # This script will automatically update udev with new rules if files
 # have been installed or updated in /usr/lib/udev/rules.d.
-if test -d /run/systemd/system; then
-  %{_bindir}/udevadm control --reload
+if test -e /run/udev/control; then
+  %{_bindir}/udevadm control --reload || :
 fi
 
 %transfiletriggerin -- /usr/lib/sysctl.d
 # This script will automatically apply sysctl rules if files have been
 # installed or updated in /usr/lib/sysctl.d.
 if test -d /run/systemd/system; then
-  /usr/lib/systemd/systemd-sysctl
+  /usr/lib/systemd/systemd-sysctl || :
 fi
 
 %transfiletriggerin -- /usr/lib/binfmt.d