{crypt,dmraid,,lvm,mdraid}/check use blkid if no vol_id found

diff --git a/modules.d/90crypt/check b/modules.d/90crypt/check
index edd450d99568cf0fc0eb3a7844dcecef65c86850..714c53a4068c134b2dd70103beff29706aec0286 100755 (executable)
--- a/modules.d/90crypt/check
+++ b/modules.d/90crypt/check
@@ -9,7 +9,11 @@ which cryptsetup >/dev/null 2>&1 || exit 1
 
 . $dracutfunctions
 
-is_crypt() { /lib/udev/vol_id /dev/block/$1 |grep -q crypto_LUKS; }
+if [ -x /lib/udev/vol_id ]; then
+       is_crypt() { /lib/udev/vol_id /dev/block/$1 |grep -q crypto_LUKS; }
+else
+       is_crypt() { blkid /dev/block/$1 |grep -q crypto_LUKS; }
+fi
 
 [[ $1 = '-h' ]] && {
     rootdev=$(find_root_block_device)

diff --git a/modules.d/90dmraid/check b/modules.d/90dmraid/check
index 7008f811dac0895340ae8d8465c90d5b317afc6d..947339b241e739d322fe1a939914031a91a2ff84 100755 (executable)
--- a/modules.d/90dmraid/check
+++ b/modules.d/90dmraid/check
@@ -6,8 +6,13 @@ which dmraid >/dev/null 2>&1 || exit 1
 
 . $dracutfunctions
 
-is_dmraid() { /lib/udev/vol_id /dev/block/$1 |grep -v linux_raid_member | \
-    grep -q _raid_member; }
+if [ -x /lib/udev/vol_id ]; then
+    is_dmraid() { /lib/udev/vol_id /dev/block/$1 |grep -v linux_raid_member | \
+        grep -q _raid_member; }
+else
+    is_dmraid() { blkid /dev/block/$1 |grep -v linux_raid_member | \
+        grep -q _raid_member; }
+fi
 
 [[ $1 = '-h' ]] && {
     rootdev=$(find_root_block_device)

diff --git a/modules.d/90lvm/check b/modules.d/90lvm/check
index 3e6a990755abb74dd623335e23842235e02bad60..8382ad716100a60f0656ef9e2ee552b0f2f93f29 100755 (executable)
--- a/modules.d/90lvm/check
+++ b/modules.d/90lvm/check
@@ -5,7 +5,11 @@ which lvm >/dev/null 2>&1 || exit 1
 
 . $dracutfunctions
 
-is_lvm() { /lib/udev/vol_id /dev/block/$1 |grep -q LVM2_member; }
+if [ -x /lib/udev/vol_id ]; then
+    is_lvm() { /lib/udev/vol_id /dev/block/$1 |grep -q LVM2_member; }
+else
+    is_lvm() { blkid /dev/block/$1 |grep -q LVM2_member; }
+fi
 
 [[ $1 = '-h' ]] && {
     rootdev=$(find_root_block_device)

diff --git a/modules.d/90mdraid/check b/modules.d/90mdraid/check
index d002bdc333bbb6639cb944bb1d8caaad136c52bf..cc3863248685052430913f71c4a35bd05b145061 100755 (executable)
--- a/modules.d/90mdraid/check
+++ b/modules.d/90mdraid/check
@@ -5,7 +5,11 @@ which mdadm >/dev/null 2>&1 || exit 1
 
 . $dracutfunctions
 
-is_mdraid() { /lib/udev/vol_id /dev/block/$1 |egrep -q '(linux|isw)_raid'; }
+if [ -x /lib/udev/vol_id ]; then
+    is_mdraid() { /lib/udev/vol_id /dev/block/$1 |egrep -q '(linux|isw)_raid'; }
+else
+    is_mdraid() { blkid /dev/block/$1 |egrep -q '(linux|isw)_raid'; }
+fi
 
 [[ $1 = '-h' ]] && {
     rootdev=$(find_root_block_device)