fix(crypt): move devnames function from base module to crypt

dracutdevs · Feb 21, 2023 · 3eeff0e · 3eeff0e
1 parent f3a7172
commit 3eeff0e
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 40 deletions.
diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh
@@ -2,6 +2,46 @@
 
 command -v getarg > /dev/null || . /lib/dracut-lib.sh
 
+# Get kernel name for given device.  Device may be the name too (then the same
+# is returned), a symlink (full path), UUID (prefixed with "UUID=") or label
+# (prefixed with "LABEL=").  If just a beginning of the UUID is specified or
+# even an empty, function prints all device names which UUIDs match - every in
+# single line.
+#
+# NOTICE: The name starts with "/dev/".
+#
+# Example:
+#   devnames UUID=123
+# May print:
+#   /dev/dm-1
+#   /dev/sdb1
+#   /dev/sdf3
+devnames() {
+    local dev="$1"
+    local d
+    local names
+
+    case "$dev" in
+        UUID=*)
+            # shellcheck disable=SC2016
+            dev="$(foreach_uuid_until '! blkid -U $___' "${dev#UUID=}")" \
+                && return 255
+            [ -z "$dev" ] && return 255
+            ;;
+        LABEL=*) dev="$(blkid -L "${dev#LABEL=}")" || return 255 ;;
+        /dev/?*) ;;
+        *) return 255 ;;
+    esac
+
+    for d in $dev; do
+        names="$names
+$(readlink -e -q "$d")" || return 255
+    done
+
+    echo "${names#
+}"
+}
+
 # check if the crypttab contains an entry for a LUKS UUID
 crypttab_contains() {
     local luks="$1"

diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
@@ -694,46 +694,6 @@ foreach_uuid_until() (
     return 1
 )
 
-# Get kernel name for given device.  Device may be the name too (then the same
-# is returned), a symlink (full path), UUID (prefixed with "UUID=") or label
-# (prefixed with "LABEL=").  If just a beginning of the UUID is specified or
-# even an empty, function prints all device names which UUIDs match - every in
-# single line.
-#
-# NOTICE: The name starts with "/dev/".
-#
-# Example:
-#   devnames UUID=123
-# May print:
-#   /dev/dm-1
-#   /dev/sdb1
-#   /dev/sdf3
-devnames() {
-    local dev="$1"
-    local d
-    local names
-
-    case "$dev" in
-        UUID=*)
-            # shellcheck disable=SC2016
-            dev="$(foreach_uuid_until '! blkid -U $___' "${dev#UUID=}")" \
-                && return 255
-            [ -z "$dev" ] && return 255
-            ;;
-        LABEL=*) dev="$(blkid -L "${dev#LABEL=}")" || return 255 ;;
-        /dev/?*) ;;
-        *) return 255 ;;
-    esac
-
-    for d in $dev; do
-        names="$names
-$(readlink -e -q "$d")" || return 255
-    done
-
-    echo "${names#
-}"
-}
-
 usable_root() {
     local _i