Use only dmsetup with udev support

svn-id: @12432

diff --git a/mod-udev.sh b/mod-udev.sh
index 63fa61c242a2177a8fdb9839f9d6c538979274ff..ad64b1d7405510b8f7d64780d5bc750539da8b29 100644 (file)
--- a/mod-udev.sh
+++ b/mod-udev.sh
@@ -53,11 +53,24 @@ initrd_gen_udev() {
        # 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
        inst_exec $initrd_dir/blkid /sbin/blkid
-       inst_exec $initrd_dir/dmsetup /sbin/dmsetup
+
+       local dir dmsetup
+       for dir in $initrd_dir /sbin; do
+               if [ "$($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