From d964a4bfde57ad1b05d105edd5d078e1aac45da6 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Mon, 10 Oct 2011 20:27:20 +0200
Subject: [PATCH] udevd: install into /lib/udev instead of /sbin

---
 Makefile.am          |  6 ++++--
 NEWS                 | 14 ++++++++++----
 TODO                 |  1 -
 init/udev.service.in |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d8b1889c..0cc45e6f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -151,9 +151,11 @@ INSTALL_DATA_HOOKS += systemd-install-hook
 endif
 
 sbin_PROGRAMS = \
-	udev/udevd \
 	udev/udevadm
 
+libexec_PROGRAMS = \
+	udev/udevd
+
 udev_common_sources =\
 	udev/udev.h \
 	udev/udev-event.c \
@@ -233,7 +235,7 @@ extras_firmware_firmware_SOURCES = extras/firmware/firmware.c
 extras_firmware_firmware_LDADD = libudev/libudev-private.la
 extras_firmware_firmware_CPPFLAGS = $(AM_CPPFLAGS) -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
 dist_udevrules_DATA += extras/firmware/50-firmware.rules
-libexec_PROGRAMS = extras/firmware/firmware
+libexec_PROGRAMS += extras/firmware/firmware
 
 # ------------------------------------------------------------------------------
 # ata_id - ATA identify
diff --git a/NEWS b/NEWS
index 2f96d091..2649ac55 100644
--- a/NEWS
+++ b/NEWS
@@ -2,16 +2,22 @@ udev 173+
 ========
 Bugfixes.
 
-The path_id, usb_id, input_id tools are built-in commands now
-and the stand-alone tools do not exist anymore. For testing,
-the commands can be run with 'udevadm test-builtin <cmd>'.
+The udev daemon moved to /lib/udev/udevd. Non-systemd init systems
+and non-dracut initramfs image generators need to change the init
+scripts. Alternatively the udev build needs to move udevd back to
+/sbin or create a symlink in /sbin, which is not done by default.
+
+The path_id, usb_id, input_id tools are built-in commands now and
+the stand-alone tools do not exist anymore. Static lists of file in
+initramfs generators need to be updated. For testing, the commands
+can still be executed standalone with 'udevadm test-builtin <cmd>'.
 
 The fusectl filesystem is no longer mounted directly from udev.
 Systemd systems will take care of mounting fusectl and configfs
 now. Non-systemd systems need to ship their own rule if they
 need these filesystems auto-mounted.
 
-The long deprecated keys: SYSFS, ID, BUS have been removed.
+The long deprecated keys: SYSFS=, ID=, BUS= have been removed.
 
 The support for 'udevadm trigger --type=failed, and the
 RUN{fail_event_on_error} attribute was removed.
diff --git a/TODO b/TODO
index 6e33f428..96d5b681 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,5 @@
  - test (now fixed) /dev/tape/ links
 
- - move udevd -> --libexecdir
  - move udevadm -> --bindir
 
  - have a $attrs{} ?
diff --git a/init/udev.service.in b/init/udev.service.in
index 4107b6a9..0a3f6286 100644
--- a/init/udev.service.in
+++ b/init/udev.service.in
@@ -11,4 +11,4 @@ Type=notify
 OOMScoreAdjust=-1000
 Sockets=udev-control.socket udev-kernel.socket
 Restart=on-failure
-ExecStart=@sbindir@/udevd
+ExecStart=@libexecdir@/udevd
-- 
2.39.5