install/udev: relocate udevd for udev 174

- usb_id and path_id are now builtin functionality of udevadm
- /sbin/udevd moves to /lib/udev/udevd
- update dev PKGBUILD to reflect version requirement

Signed-off-by: Dave Reisner <dreisner@archlinux.org>

3 files changed, 5 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 0e10d8a..a6a083f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ groups=('base')
 conflicts=('mkinitcpio')
 provides=("mkinitcpio=$pkgver")
 depends=('mkinitcpio-busybox>=1.16.1-2' 'module-init-tools' 'util-linux>=2.19' 'libarchive' 'coreutils'
-         'bash' 'findutils' 'sed' 'grep' 'filesystem>=2011.10-1' 'udev>=171-2' 'file' 'gzip')
+         'bash' 'findutils' 'sed' 'grep' 'filesystem>=2011.10-1' 'udev>=174-1' 'file' 'gzip')
 makedepends=('asciidoc' 'git')
 optdepends=('xz: Use lzma or xz compression for the initramfs image'
             'bzip2: Use bzip2 compression for the initramfs image'
diff --git a/init b/init
index dcd4d53..c772590 100644
--- a/init
+++ b/init
@@ -30,9 +30,9 @@ echo "/sbin/modprobe" > /proc/sys/kernel/modprobe
 parse_cmdline
 
 # if available, start udevd at this stage
-if [ -x /sbin/udevd ]; then
+if [ -x /lib/udev/udevd ]; then
     msg ":: Starting udevd..."
-    udevd --daemon --resolve-names=never
+    /lib/udev/udevd --daemon --resolve-names=never
     udevd_running=1
     msg "done."
 else
diff --git a/install/udev b/install/udev
index 6d0804b..9275501 100644
--- a/install/udev
+++ b/install/udev
@@ -4,13 +4,13 @@ build() {
     FILES="/etc/udev/udev.conf"
     SCRIPT="udev"
 
-    add_binary /sbin/udevd
+    add_binary /lib/udev/udevd
     add_binary /sbin/udevadm
 
     for rules in 50-{firmware,udev-default}.rules 60-persistent-storage.rules 80-drivers.rules; do
         add_file "/lib/udev/rules.d/$rules"
     done
-    for tool in firmware {ata,path,scsi,usb}_id; do
+    for tool in firmware {ata,scsi}_id; do
         add_file "/lib/udev/$tool"
     done
 }