From: Kay Sievers <kay.sievers@vrfy.org>
Date: Fri, 3 Sep 2010 11:30:57 +0000 (+0200)
Subject: systemd: enable all udev services unconditionally
X-Git-Tag: 174~345
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a04879b5643e9100b3c34c5c4ea9b44c5eec3e92

systemd: enable all udev services unconditionally
---

diff --git a/Makefile.am b/Makefile.am
index 512de34a3..44cf00218 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,11 @@ DISTCHECK_CONFIGURE_FLAGS = \
 
 CLEANFILES =
 
+INSTALL_EXEC_HOOKS =
+INSTALL_DATA_HOOKS =
+UNINSTALL_EXEC_HOOKS =
+DISTCHECK_HOOKS =
+
 # ------------------------------------------------------------------------------
 # libudev
 # ------------------------------------------------------------------------------
@@ -84,16 +89,18 @@ libudev-install-move-hook:
 libudev-uninstall-move-hook:
 	rm -f $(DESTDIR)$(rootlib_execdir)/libudev.so*
 
-INSTALL_EXEC_HOOKS = libudev-install-move-hook
-UNINSTALL_EXEC_HOOKS = libudev-uninstall-move-hook
+INSTALL_EXEC_HOOKS += libudev-install-move-hook
+UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook
 
 # ------------------------------------------------------------------------------
 # main udev
 # ------------------------------------------------------------------------------
-install-data-local:
+udev-confdirs:
 	-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
 	-mkdir -p $(DESTDIR)$(libexecdir)/devices
 
+INSTALL_DATA_HOOKS += udev-confdirs
+
 EXTRA_DIST += \
 	rules/arch \
 	rules/misc
@@ -120,6 +127,14 @@ systemdsystemunit_DATA = \
 	init/udev.service \
 	init/udev-settle.service \
 	init/udev-retry.service
+
+systemd-install-hook:
+	mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sysinit.target.wants
+	ln -sf ../udev.service $(DESTDIR)$(systemdsystemunitdir)/sysinit.target.wants/udev.service
+	ln -sf ../udev-settle.service $(DESTDIR)$(systemdsystemunitdir)/sysinit.target.wants/udev-settle.service
+	ln -sf ../udev-retry.service $(DESTDIR)$(systemdsystemunitdir)/sysinit.target.wants/udev-retry.service
+
+INSTALL_DATA_HOOKS += systemd-install-hook
 endif
 
 sbin_PROGRAMS = \
@@ -585,7 +600,7 @@ extras/keymap/keys-to-name.h: extras/keymap/keys.txt Makefile
 
 keymaps-distcheck-hook: extras/keymap/keys.txt
 	$(top_srcdir)/extras/keymap/check-keymaps.sh $(top_srcdir) $^
-DISTCHECK_HOOKS = keymaps-distcheck-hook
+DISTCHECK_HOOKS += keymaps-distcheck-hook
 
 endif # ENABLE_EXTRAS
 
@@ -607,6 +622,8 @@ EXTRA_DIST += $(TESTS)
 
 install-exec-hook: $(INSTALL_EXEC_HOOKS)
 
+install-data-hook: $(INSTALL_DATA_HOOKS)
+
 uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
 
 distcheck-hook: $(DISTCHECK_HOOKS)
diff --git a/init/udev-retry.service.in b/init/udev-retry.service.in
index ab8241b85..222714e89 100644
--- a/init/udev-retry.service.in
+++ b/init/udev-retry.service.in
@@ -5,8 +5,5 @@ After=local-fs.target udev.service
 
 [Service]
 Type=oneshot
+RemainAfterExit=yes
 ExecStart=@sbindir@/udevadm trigger --type=failed --action=add
-
-[Install]
-WantedBy=sysinit.target
-Also=udev.service udev-settle.service
diff --git a/init/udev-settle.service.in b/init/udev-settle.service.in
index d58ea9c27..7550aaebd 100644
--- a/init/udev-settle.service.in
+++ b/init/udev-settle.service.in
@@ -7,7 +7,3 @@ After=udev.service
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=@sbindir@/udevadm settle
-
-[Install]
-WantedBy=sysinit.target
-Also=udev.service udev-retry.service
diff --git a/init/udev.service.in b/init/udev.service.in
index b07f4db6b..4e5488f3a 100644
--- a/init/udev.service.in
+++ b/init/udev.service.in
@@ -7,7 +7,3 @@ Before=sysinit.target
 Type=notify
 ExecStart=@sbindir@/udevd
 ExecStartPost=@sbindir@/udevadm trigger --type=subsystems --action=add ; @sbindir@/udevadm trigger --type=devices --action=add
-
-[Install]
-WantedBy=sysinit.target
-Also=udev-settle.service udev-retry.service