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.
33 lines
1.0 KiB
33 lines
1.0 KiB
6 years ago
|
From 58a5434f75567ecfe4a37252cedee25eb66da7d4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alexander Tsoy <alexander@tsoy.me>
|
||
|
|
Date: Tue, 5 Jan 2016 22:11:57 +0300
|
||
|
|
Subject: [PATCH] base/dracut-lib.sh:dev_unit_name() guard against $dev
|
||
|
|
beginning with "-"
|
||
|
|
|
||
|
|
crypt/parse-crypt.sh generate initqueue job which always call
|
||
|
|
dev_unit_name() with an argument beginning with "-". This results
|
||
|
|
in the following error:
|
||
|
|
|
||
|
|
dracut-initqueue[307]: + systemd-escape -p -cfb4aa43-2f02-4c6b-a313-60ea99288087
|
||
|
|
dracut-initqueue[307]: systemd-escape: invalid option -- 'c'
|
||
|
|
|
||
|
|
Cherry-picked from: c41df7e1
|
||
|
|
Resolves: #1306640
|
||
|
|
---
|
||
|
|
modules.d/99base/dracut-lib.sh | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
|
||
|
|
index 7502ab66..0a587ae6 100755
|
||
|
|
--- a/modules.d/99base/dracut-lib.sh
|
||
|
|
+++ b/modules.d/99base/dracut-lib.sh
|
||
|
|
@@ -875,7 +875,7 @@ dev_unit_name()
|
||
|
|
local dev="$1"
|
||
|
|
|
||
|
|
if command -v systemd-escape >/dev/null; then
|
||
|
|
- systemd-escape -p "$dev"
|
||
|
|
+ systemd-escape -p -- "$dev"
|
||
|
|
return
|
||
|
|
fi
|
||
|
|
|