picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

systemd: enable all udev services unconditionally

This commit is contained in:
Kay Sievers 2010-09-03 13:30:57 +02:00
parent 8937f371fb
commit a04879b564
4 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile.am
View File

@ -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)

5
init/udev-retry.service.in
View File

@ -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

4
init/udev-settle.service.in
View File

@ -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

4
init/udev.service.in
View File

@ -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