You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
59 lines
1.6 KiB
59 lines
1.6 KiB
6 years ago
|
From 014a78261db67c287d25aafa33266593d816315a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thorsten Behrens <tbehrens@suse.com>
|
||
|
|
Date: Thu, 11 Dec 2014 15:46:08 +0100
|
||
|
|
Subject: [PATCH] Align dev_unit_name() with systemd's function.
|
||
|
|
|
||
|
|
Add more corner cases from systemd's
|
||
|
|
unit_name_from_path_instance() C function.
|
||
|
|
|
||
|
|
Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
|
||
|
|
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
||
|
|
|
||
|
|
Cherry-picked from: e3eec4b8
|
||
|
|
Resolves: #1306640
|
||
|
|
---
|
||
|
|
modules.d/99base/dracut-lib.sh | 24 ++++++++++++++++++------
|
||
|
|
1 file changed, 18 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
|
||
|
|
index e04a9b3d..46cee5a9 100755
|
||
|
|
--- a/modules.d/99base/dracut-lib.sh
|
||
|
|
+++ b/modules.d/99base/dracut-lib.sh
|
||
|
|
@@ -868,18 +868,30 @@ wait_for_mount()
|
||
|
|
} >> "$hookdir/emergency/90-${_name}.sh"
|
||
|
|
}
|
||
|
|
|
||
|
|
+# get a systemd-compatible unit name from a path
|
||
|
|
+# (mimicks unit_name_from_path_instance())
|
||
|
|
dev_unit_name()
|
||
|
|
{
|
||
|
|
+ local dev="$1"
|
||
|
|
+
|
||
|
|
if command -v systemd-escape >/dev/null; then
|
||
|
|
- systemd-escape -p "$1"
|
||
|
|
+ systemd-escape -p "$dev"
|
||
|
|
return
|
||
|
|
fi
|
||
|
|
|
||
|
|
- _name="${1%%/}"
|
||
|
|
- _name="${_name##/}"
|
||
|
|
- _name="$(str_replace "$_name" '-' '\x2d')"
|
||
|
|
- _name="$(str_replace "$_name" '/' '-')"
|
||
|
|
- echo "$_name"
|
||
|
|
+ if [ "$dev" = "/" -o -z "$dev" ]; then
|
||
|
|
+ printf -- "-"
|
||
|
|
+ exit 0
|
||
|
|
+ fi
|
||
|
|
+
|
||
|
|
+ dev="${1%%/}"
|
||
|
|
+ dev="${dev##/}"
|
||
|
|
+ dev="$(str_replace "$dev" '\' '\x5c')"
|
||
|
|
+ dev="$(str_replace "$dev" '-' '\x2d')"
|
||
|
|
+ dev=${dev/#\./\\x2e}
|
||
|
|
+ dev="$(str_replace "$dev" '/' '-')"
|
||
|
|
+
|
||
|
|
+ printf -- "%s" "$dev"
|
||
|
|
}
|
||
|
|
|
||
|
|
# wait_for_dev <dev>
|