no need to mess with magic values, let the "magic" be value

[projects/geninitrd.git] / mod-udev.sh

diff --git a/mod-udev.sh b/mod-udev.sh
index 97f9be064c1b8c405c3eeea6a47ebea0d9de1ad1..a5638500acf1d9d60f5493dfa45b176694ab0e90 100644 (file)
--- a/mod-udev.sh
+++ b/mod-udev.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-RCSID='$Revision: 12159 $ $Date: 2011-02-17 23:16:30 +0100 (czw) $'
+UDEV_RCSID='$Revision$ $Date::                            $'
 
 # geninitrd mod: udev
 USE_UDEV=${USE_UDEV:-yes}
@@ -9,6 +9,20 @@ USE_UDEV=${USE_UDEV:-yes}
 # - make udev start before insmods
 # - make proper use of USE_UDEV - don't copy rules if USE_UDEV is off no!
 
+inst_rules() {
+       local _rule _found d
+
+       inst_d "/lib/udev/rules.d"
+       for _rule in "$@"; do
+               for d in /lib/udev/rules.d /etc/udev/rules.d /lib/geninitrd/udev-rules; do
+                       if [ -f $d/$_rule ]; then
+                               inst $d/$_rule /lib/udev/rules.d/$_rule
+                       fi
+               done
+       done
+
+}
+
 # setup geninitrd module
 # @access      public
 setup_mod_udev() {
@@ -33,13 +47,45 @@ initrd_gen_udev() {
        inst_exec $udevd /sbin/udevd
        inst_exec $udevadm /sbin/udevadm
        inst /etc/udev/udev.conf /etc/udev/udev.conf
+       # standard udev rules
+       inst_rules 50-udev-default.rules 60-persistent-storage.rules 61-persistent-storage-edd.rules 80-drivers.rules 95-udev-late.rules \
+               60-pcmcia.rules 50-firmware.rules 10-dm.rules 11-dm-lvm.rules 13-dm-disk.rules
+       # initrd dedicated rules
+       inst_rules 01-ignore.rules 59-persistent-storage.rules 61-persistent-storage.rules 11-dm.rules
+
+       local e
+       for e in ata_id cdrom_id collect firmware scsi_id v4l_id; do
+               inst_exec $initrd_dir/udev/$e /lib/udev/$e
+       done
+
+       # blkid installed by mod-blkid
+       if ! is_yes "$USE_BLKID"; then
+               warn "BLKID support missing"
+       fi
+
+       local dir dmsetup
+       for dir in $initrd_dir /sbin; do
+               if [ -x "$dir/dmsetup" ] &&
+                       [ "$($dir/dmsetup udevcookies 2>&1 | grep -c 'Command not supported')" -eq 0 ]; then
+                       dmsetup=$dir/dmsetup
+                       break
+               fi
+       done
+       if [ -z "$dmsetup" ]; then
+               warn "Can't find dmsetup with udev support"
+       else
+               inst_exec $dmsetup /sbin/dmsetup
+       fi
 
        mount_dev
        mount_sys
+       mount_run
        add_linuxrc <<-'EOF'
                : 'Starting udev'
+               mkdir /run/udev
                /sbin/udevd --daemon
-               /sbin/udevadm trigger
+               /sbin/udevadm trigger --type=subsystems --action=add
+               /sbin/udevadm trigger --type=devices --action=add
                /sbin/udevadm settle
        EOF
 }
@@ -48,8 +94,8 @@ initrd_gen_stop_udevd() {
        if ! is_yes "$USE_UDEV"; then
                return
        fi
-       busybox_applet killall
        add_linuxrc     <<-'EOF'
-               killall udevd
+               /sbin/udevadm control --exit
+               /sbin/udevadm info --cleanup-db
        EOF
 }