From: Harald Hoyer <harald@redhat.com>
Date: Wed, 19 Aug 2009 15:11:29 +0000 (+0200)
Subject: {crypt,dmraid,,lvm,mdraid}/check use blkid if no vol_id found
X-Git-Tag: 001~34^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=afe25d0ccc8a4c553522c162d37b261af3f7b8a6;p=thirdparty%2Fdracut.git

{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 edd450d99..714c53a40 100755
--- 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 7008f811d..947339b24 100755
--- 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 3e6a99075..8382ad716 100755
--- 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 d002bdc33..cc3863248 100755
--- 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)