From 65fed728623cb590f600c579ed9d277e74691899 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Oct 07 2016 11:55:56 +0000
Subject: Prevent systemd-udev-trigger.service from restarting


systemd-udev package should be updated in lockstep, so we rely on the
daemon-reexec in systemd.rpm's %post to get the drop in loaded.

---

diff --git a/systemd-udev-trigger-no-reload.conf b/systemd-udev-trigger-no-reload.conf
new file mode 100644
index 0000000..c879427
--- /dev/null
+++ b/systemd-udev-trigger-no-reload.conf
@@ -0,0 +1,3 @@
+[Unit]
+# https://bugzilla.redhat.com/show_bug.cgi?id=1378974#c17
+RefuseManualStop=true
diff --git a/systemd.spec b/systemd.spec
index 4d0d31f..1ffb586 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -35,6 +35,7 @@ Source6:        sysctl.conf.README
 Source7:        systemd-journal-remote.xml
 Source8:        systemd-journal-gatewayd.xml
 Source9:        20-yama-ptrace.conf
+Source10:       systemd-udev-trigger-no-reload.conf
 
 Patch0001: 0001-systemctl-be-sure-to-be-quiet-with-systemctl-is-enab.patch
 Patch0002: 0002-logind-0-and-100-should-be-valid-for-UserTasksMax-38.patch
@@ -356,6 +357,9 @@ install -Dm0644 -t %{buildroot}/usr/lib/firewalld/services/ %{SOURCE7} %{SOURCE8
 # https://bugzilla.redhat.com/show_bug.cgi?id=1234951
 install -Dm0644 -t %{buildroot}%{_pkgdocdir}/ %{SOURCE9}
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1378974
+install -Dm0644 -t %{buildroot}%{system_unit_dir}/systemd-udev-trigger.service.d/ %{SOURCE10}
+
 %find_lang %{name}
 
 %check
@@ -951,6 +955,7 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
 %changelog
 * Fri Oct  7 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 231-9
 - Fix systemctl set-default (#1374371)
+- Prevent systemd-udev-trigger.service from restarting (follow-up for #1378974)
 
 * Tue Oct  4 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 231-8
 - Apply fix for #1378974