From: Harald Hoyer <harald@redhat.com>
Date: Wed, 31 Mar 2021 14:14:02 +0000 (+0200)
Subject: fix(dracut-systemd): regression on root=block:
X-Git-Tag: 054~129
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fcc4955884355c3943d6c41e459b4b983a818f4;p=thirdparty%2Fdracut.git

fix(dracut-systemd): regression on root=block:

Commit 3532978de04c7 introduced a regression, where the `root` could be
`root=block:block:/dev/foo`.
---

diff --git a/modules.d/98dracut-systemd/dracut-cmdline.sh b/modules.d/98dracut-systemd/dracut-cmdline.sh
index 967b330dd..44d5b31b9 100755
--- a/modules.d/98dracut-systemd/dracut-cmdline.sh
+++ b/modules.d/98dracut-systemd/dracut-cmdline.sh
@@ -51,11 +51,11 @@ source_hook cmdline
 
 case "${root#block:}${root_unset}" in
     LABEL=* | UUID=* | PARTUUID=* | PARTLABEL=*)
-        root="block:$(label_uuid_to_dev "$root")"
+        root="block:$(label_uuid_to_dev "${root#block:}")"
         rootok=1
         ;;
     /dev/*)
-        root="block:${root}"
+        root="block:${root#block:}"
         rootok=1
         ;;
     UNSET | gpt-auto | tmpfs)