Move common rootfs finding and backing store tree checking to dracut-functions

diff --git a/dracut-functions b/dracut-functions
index 66e0e20ce7176d643f4e150b5d7a9d9aaf618b5f..1df20456c3f168b7f0fa1f504408fb29b0d2c417 100755 (executable)
--- a/dracut-functions
+++ b/dracut-functions
@@ -48,6 +48,38 @@ derror() {
     [[ -w $dracutlogfile ]] && echo "E: $@" >>"$dracutlogfile"
 }
 
+# finds the major:minor of the block device backing the root filesystem.
+find_root_block_device() {
+    local rootdev blkdev fs type opts misc
+    while read blkdev fs type opts misc; do
+       [[ $blkdev = rootfs ]] && continue # skip rootfs entry
+       [[ $fs = / ]] && { rootdev=$blkdev; break; } # we have a winner!
+    done < /proc/mounts
+    [[ -b $rootdev ]] || return 1 # oops, not a block device.
+    # get major/minor for the device
+    ls -nLl "$rootdev" | \
+       (read x x x x maj min x; maj=${maj//,/}; echo $maj:$min)
+}
+
+# Walk all the slave relationships for a given block device.
+# Stop when our helper function returns success
+# $1 = function to call on every found block device
+# $2 = block device in major:minor format
+check_block_and_slaves() {    
+    local x 
+    [[ -b /dev/block/$2 ]] || return 1 # Not a block device? So sorry.
+    "$1" $2 && return
+    [[ -d /sys/dev/block/$2/slaves ]] || return 1
+    # we want to search the tree breadthwise, so...
+    for x in /sys/dev/block/$2/slaves/*/dev; do
+       $1 $(cat "$x") && return 0
+    done
+    for x in /sys/dev/block/$2/slaves/*/dev; do
+       check_block_and_slaves $1 $(cat "$x") &&  return 0
+    done
+    return 1
+}
+
 # $1 = file to copy to ramdisk
 # $2 (optional) Name for the file on the ramdisk
 # Location of the image dir is assumed to be $initdir

diff --git a/modules.d/90crypt/check b/modules.d/90crypt/check
index 7d78c4bc1f1c061301948982bd044923323c5245..edd450d99568cf0fc0eb3a7844dcecef65c86850 100755 (executable)
--- a/modules.d/90crypt/check
+++ b/modules.d/90crypt/check
@@ -7,38 +7,20 @@ which cryptsetup >/dev/null 2>&1 || exit 1
 # in some way, but I am too lazy to figure out how to do that.
 # Instead, fail if we do not have a LUKS device in use somewhere.
 
-is_crypt() { /lib/udev/vol_id /dev/block/$1 |grep -q crypto_LUKS; }
+. $dracutfunctions
 
-check_block_and_slaves() (
-    # $1 = block device in major:minor format
-    local x
-    cd /sys/dev/block/$1
-    [[ -b /dev/block/$1 ]] || return 1 # Not a block device? So sorry.
-    is_crypt $1 && return
-    [[ -d slaves ]] || return 1 # there are no underlying devices, done.
-    # we want to search the tree breadthwise, so...
-    for x in slaves/*/dev; do
-       is_crypt $(cat "$x") && return 0
-    done
-    for x in slaves/*/dev; do
-       check_block_and_slaves $(cat "$x") &&  return 0
-    done
-    return 1
-)
+is_crypt() { /lib/udev/vol_id /dev/block/$1 |grep -q crypto_LUKS; }
 
-if [[ $1 = '-h' ]] ; then
-    rootdev=''
-    while read blkdev fs type opts misc; do
-       [[ $blkdev = rootfs ]] && continue # skip rootfs entry
-       [[ $fs = / ]] && { rootdev=$blkdev; break; }
-    done < /proc/mounts
-    [[ -b $rootdev ]] || exit 1 # Not on a block device?  Definitly not crypted.
-    # get major/minor for the device
-    majmin=$(ls -nLl "$rootdev" | \
-       (read x x x x maj min x; maj=${maj//,/}; echo $maj:$min))
-    # now, walk backwards though our master/slave relationships looking
-    # for a crypt_LUKS device
-    check_block_and_slaves $majmin || exit 1
-fi
+[[ $1 = '-h' ]] && {
+    rootdev=$(find_root_block_device)
+    if [[ $rootdev ]]; then
+       # root lives on a block device, so we can be more precise about 
+       # hostonly checking
+       check_block_and_slaves is_crypt "$rootdev" || exit 1
+    else
+       # root is not on a block device, use the shotgun approach
+       blkid | grep -q crypt_LUKS || exit 1
+    fi
+}
 
 exit 0