]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
base/dracut-lib.sh: add dev_unit_name()
authorHarald Hoyer <harald@redhat.com>
Thu, 4 Apr 2013 10:51:33 +0000 (12:51 +0200)
committerHarald Hoyer <harald@redhat.com>
Thu, 4 Apr 2013 10:52:53 +0000 (12:52 +0200)
add helper function to convert device path to systemd unit names

modules.d/99base/dracut-lib.sh

index e456b01de0252fa824da99b7960624d89e7e1686..79fc95310dba2560d8bea824a26a78ed8a9986c8 100755 (executable)
@@ -818,6 +818,15 @@ wait_for_mount()
     } >> "$hookdir/emergency/90-${_name}.sh"
 }
 
+dev_unit_name()
+{
+    _name="${1%%/}"
+    _name="${_name##/}"
+    _name="$(str_replace "$_name" '-' '\x2d')"
+    _name="$(str_replace "$_name" '/' '-')"
+    echo "$_name"
+}
+
 # wait_for_dev <dev>
 #
 # Installs a initqueue-finished script,
@@ -835,10 +844,7 @@ wait_for_dev()
     } >> "${PREFIX}$hookdir/emergency/80-${_name}.sh"
 
     if [ -n "$DRACUT_SYSTEMD" ]; then
-        _name="${1%%/}"
-        _name="${_name##/}"
-        _name="$(str_replace "$_name" '-' '\x2d')"
-        _name="$(str_replace "$_name" '/' '-')"
+        _name=$(dev_unit_name "$1")
         if ! [ -L ${PREFIX}/etc/systemd/system/initrd.target.requires/${_name}.device ]; then
             [ -d ${PREFIX}/etc/systemd/system/initrd.target.requires ] || mkdir -p ${PREFIX}/etc/systemd/system/initrd.target.requires
             ln -s ../${_name}.device ${PREFIX}/etc/systemd/system/initrd.target.requires/${_name}.device