From f13b388f97bc3ba8db844bd3413d510e2466a0b6 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Mon, 16 Apr 2012 23:32:22 +0200 Subject: [PATCH] udev: install udevd as /usr/lib/systemd/systemd-udevd --- .gitignore | 2 +- Makefile.am | 55 +++++++++++-------- NEWS | 10 +++- man/{udevd.xml => systemd-udevd.xml} | 12 ++-- man/udev.xml | 6 +- man/udevadm.xml | 16 +++--- units/.gitignore | 6 +- ...rol.socket => systemd-udev-control.socket} | 0 ...rnel.socket => systemd-udev-kernel.socket} | 0 ...vice.in => systemd-udev-settle.service.in} | 0 ...ice.in => systemd-udev-trigger.service.in} | 0 ...dev.service.in => systemd-udev.service.in} | 4 +- 12 files changed, 63 insertions(+), 48 deletions(-) rename man/{udevd.xml => systemd-udevd.xml} (92%) rename units/{udev-control.socket => systemd-udev-control.socket} (100%) rename units/{udev-kernel.socket => systemd-udev-kernel.socket} (100%) rename units/{udev-settle.service.in => systemd-udev-settle.service.in} (100%) rename units/{udev-trigger.service.in => systemd-udev-trigger.service.in} (100%) rename units/{udev.service.in => systemd-udev.service.in} (72%) diff --git a/.gitignore b/.gitignore index af7a017b6d..08beb9afec 100644 --- a/.gitignore +++ b/.gitignore @@ -112,7 +112,7 @@ stamp-* /mtd_probe /scsi_id /udevadm -/udevd +/systemd-udevd /v4l_id /test-libudev /test-udev diff --git a/Makefile.am b/Makefile.am index 421d27c886..90c225ec01 100644 --- a/Makefile.am +++ b/Makefile.am @@ -101,6 +101,7 @@ check_PROGRAMS = check_DATA = noinst_PROGRAMS = TESTS = +udevlibexec_PROGRAMS = AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ @@ -296,8 +297,8 @@ dist_systemunit_DATA = \ units/systemd-ask-password-wall.path \ units/systemd-ask-password-console.path \ units/syslog.target \ - units/udev-control.socket \ - units/udev-kernel.socket + units/systemd-udev-control.socket \ + units/systemd-udev-kernel.socket nodist_systemunit_DATA = \ units/getty@.service \ @@ -323,9 +324,9 @@ nodist_systemunit_DATA = \ units/fsck-root.service \ units/rescue.service \ units/user@.service \ - units/udev.service \ - units/udev-trigger.service \ - units/udev-settle.service + units/systemd-udev.service \ + units/systemd-udev-trigger.service \ + units/systemd-udev-settle.service dist_userunit_DATA = \ units/user/default.target \ @@ -359,9 +360,9 @@ EXTRA_DIST += \ units/fsck@.service.in \ units/fsck-root.service.in \ units/user@.service.in \ - units/udev.service \ - units/udev-trigger.service \ - units/udev-settle.service \ + units/systemd-udev.service \ + units/systemd-udev-trigger.service \ + units/systemd-udev-settle.service \ introspect.awk \ man/custom-html.xsl @@ -1358,7 +1359,7 @@ libudev_private_la_LIBADD = \ MANPAGES += \ man/udev.7 \ man/udevadm.8 \ - man/udevd.8 + man/systemd-udevd.8 udev-confdirs: -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d @@ -1398,30 +1399,30 @@ CLEANFILES += \ src/udev/udev.pc EXTRA_DIST += \ - units/udev.service.in \ - units/udev-trigger.service.in \ - units/udev-settle.service.in + units/systemd-udev.service.in \ + units/systemd-udev-trigger.service.in \ + units/systemd-udev-settle.service.in CLEANFILES += \ - units/udev.service \ - units/udev-trigger.service \ - units/udev-settle.service + units/systemd-udev.service \ + units/systemd-udev-trigger.service \ + units/systemd-udev-settle.service systemd-install-hook: mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants - ln -sf ../udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/udev-control.socket - ln -sf ../udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/udev-kernel.socket + ln -sf ../systemd-udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-control.socket + ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-kernel.socket mkdir -p $(DESTDIR)$(systemunitdir)/basic.target.wants - ln -sf ../udev.service $(DESTDIR)$(systemunitdir)/basic.target.wants/udev.service - ln -sf ../udev-trigger.service $(DESTDIR)$(systemunitdir)/basic.target.wants/udev-trigger.service + ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev.service + ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev-trigger.service INSTALL_DATA_HOOKS += systemd-install-hook bin_PROGRAMS += \ udevadm -udevlibexec_PROGRAMS = \ - udevd +rootlibexec_PROGRAMS += \ + systemd-udevd noinst_LTLIBRARIES += \ libudev-core.la @@ -1469,10 +1470,10 @@ libudev_core_la_LIBADD += \ libsystemd-acl.la endif -udevd_SOURCES = \ +systemd_udevd_SOURCES = \ src/udev/udevd.c -udevd_LDADD = \ +systemd_udevd_LDADD = \ libudev-core.la udevadm_SOURCES = \ @@ -3227,6 +3228,9 @@ install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS) distclean-local: $(DISTCLEAN_LOCAL_HOOKS) +clean-local: + rm -rf $(abs_srcdir)/install-tree + DISTCHECK_CONFIGURE_FLAGS = \ --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \ --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \ @@ -3249,3 +3253,8 @@ doc-sync: all git-tag: git tag "v$(VERSION)" -m "systemd $(VERSION)" + +install-tree: all + rm -rf $(abs_srcdir)/install-tree + make install DESTDIR=$(abs_srcdir)/install-tree + tree $(abs_srcdir)/install-tree diff --git a/NEWS b/NEWS index 52196dc0b1..dc04d0a345 100644 --- a/NEWS +++ b/NEWS @@ -8,8 +8,9 @@ CHANGES WITH 182: udev though, will require the *build* of the systemd tree, but udev can be properly *run* without systems. - * udev: /lib/udev/devices/ are not read anymore; tmpfiles should - be used to create workarounds for broken subsystems. + * udev: /lib/udev/devices/ are not read anymore; systemde-tmpfiles + should be used to create dead device nodes as workarounds for broken + subsystems. * udev: RUN+="socket:..." and udev_monitor_new_from_socket() is no longer supported. udev_monitor_new_from_netlink() needs to be @@ -22,6 +23,11 @@ CHANGES WITH 182: pulled-in by udev to ge started, but they can no longer be directly forked by udev rules. + * udev: the daemon binary is called systemd-udevd now and installed + in /usr/lib/systemd/. Standalone builds or non-systemd systems need + to adapt to that, create symlink, or rename the binary after building + it. + * systemd-logingctl and systemd-journalctl have been renamed to logingctl and journalctl to match systemctl. diff --git a/man/udevd.xml b/man/systemd-udevd.xml similarity index 92% rename from man/udevd.xml rename to man/systemd-udevd.xml index 7c4e174cbe..1be356f8c6 100644 --- a/man/udevd.xml +++ b/man/systemd-udevd.xml @@ -3,7 +3,7 @@ - + udevd systemd @@ -18,18 +18,18 @@ - udevd + systemd-udevd 8 - udevdevent managing daemon + systemd-udevdevent managing daemon - udevd + systemd-udevd @@ -41,7 +41,7 @@ Description - udevd listens to kernel uevents. For every event, udevd executes matching + systemd-udevd listens to kernel uevents. For every event, systemd-udevd executes matching instructions specified in udev rules. See udev7 . @@ -80,7 +80,7 @@ - Specify when udevd should resolve names of users and groups. + Specify when systemd-udevd should resolve names of users and groups. When set to (the default) names will be resolved when the rules are parsed. When set to names will be resolved for every event. diff --git a/man/udev.xml b/man/udev.xml index 458d351658..bd0dec6a6a 100644 --- a/man/udev.xml +++ b/man/udev.xml @@ -41,7 +41,7 @@ names provide a way to reliably identify devices based on their properties or current configuration. - The udev daemon, udevd + The udev daemon, systemd-udevd 8, receives device uevents directly from the kernel whenever a device is added or removed from the system, or it changes its state. When udev receives a device event, it matches its configured set of rules @@ -512,7 +512,7 @@ Apply the permissions specified in this rule to the static device node with the specified name. Static device node creation can be requested by kernel modules. - These nodes might not have a corresponding kernel device at the time udevd is + These nodes might not have a corresponding kernel device at the time systemd-udevd is started; they can trigger automatic kernel module loading. @@ -691,7 +691,7 @@ See Also - udevd8 + systemd-udevd8 , udevadm8 diff --git a/man/udevadm.xml b/man/udevadm.xml index 11900d202e..cbf22b4b5e 100644 --- a/man/udevadm.xml +++ b/man/udevadm.xml @@ -322,13 +322,13 @@ - Signal and wait for udevd to exit. + Signal and wait for systemd-udevd to exit. - Set the internal log level of udevd. Valid values are the numerical + Set the internal log level of systemd-udevd. Valid values are the numerical syslog priorities or their textual representations: , and . @@ -336,20 +336,20 @@ - Signal udevd to stop executing new events. Incoming events + Signal systemd-udevd to stop executing new events. Incoming events will be queued. - Signal udevd to enable the execution of events. + Signal systemd-udevd to enable the execution of events. - Signal udevd to reload the rules files and other databases like the kernel + Signal systemd-udevd to reload the rules files and other databases like the kernel module index. Reloading rules and databases does not apply any changes to already existing devices; the new configuration will only be applied to new events. @@ -363,14 +363,14 @@ value - Set the maximum number of events, udevd will handle at the + Set the maximum number of events, systemd-udevd will handle at the same time. seconds - The maximum number seconds to wait for a reply from udevd. + The maximum number seconds to wait for a reply from systemd-udevd. @@ -470,7 +470,7 @@ udev7 - udevd8 + systemd-udevd8 diff --git a/units/.gitignore b/units/.gitignore index 3cf64237a8..eda676a480 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -41,6 +41,6 @@ systemd-update-utmp-shutdown.service test-env-replace systemd-binfmt.service emergency.service -/udev-settle.service -/udev-trigger.service -/udev.service +/systemd-udev-settle.service +/systemd-udev-trigger.service +/systemd-udev.service diff --git a/units/udev-control.socket b/units/systemd-udev-control.socket similarity index 100% rename from units/udev-control.socket rename to units/systemd-udev-control.socket diff --git a/units/udev-kernel.socket b/units/systemd-udev-kernel.socket similarity index 100% rename from units/udev-kernel.socket rename to units/systemd-udev-kernel.socket diff --git a/units/udev-settle.service.in b/units/systemd-udev-settle.service.in similarity index 100% rename from units/udev-settle.service.in rename to units/systemd-udev-settle.service.in diff --git a/units/udev-trigger.service.in b/units/systemd-udev-trigger.service.in similarity index 100% rename from units/udev-trigger.service.in rename to units/systemd-udev-trigger.service.in diff --git a/units/udev.service.in b/units/systemd-udev.service.in similarity index 72% rename from units/udev.service.in rename to units/systemd-udev.service.in index 7336e0eec7..60d8601217 100644 --- a/units/udev.service.in +++ b/units/systemd-udev.service.in @@ -9,6 +9,6 @@ ConditionCapability=CAP_MKNOD [Service] Type=notify OOMScoreAdjust=-1000 -Sockets=udev-control.socket udev-kernel.socket +Sockets=systemd-udev-control.socket systemd-udev-kernel.socket Restart=on-failure -ExecStart=@udevlibexecdir@/udevd +ExecStart=@rootlibexecdir@/systemd-udevd