systemd/dracut-cmdline.sh: unset "UNSET" $root

https://bugzilla.redhat.com/show_bug.cgi?id=1365667
caused by commit 9aa224cc

(cherry picked from commit fc77aca7ddbd33328066a943a4de09de34d25c4c)

diff --git a/modules.d/98dracut-systemd/dracut-cmdline.sh b/modules.d/98dracut-systemd/dracut-cmdline.sh
index ccf24fb25a03ef73e433d63db5af857099df456d..6c6ee02632665aaa9f16ff69d14260ccbcb237ce 100755 (executable)
--- a/modules.d/98dracut-systemd/dracut-cmdline.sh
+++ b/modules.d/98dracut-systemd/dracut-cmdline.sh
@@ -25,7 +25,7 @@ source_conf /etc/conf.d
 # between the case where it was set to the empty string and the case where it
 # wasn't specified at all.
 if ! root="$(getarg root=)"; then
-    root='UNSET'
+    root_unset='UNSET'
 fi
 
 rflags="$(getarg rootflags=)"
@@ -49,7 +49,7 @@ source_hook cmdline
 
 [ -f /lib/dracut/parse-resume.sh ] && . /lib/dracut/parse-resume.sh
 
-case "$root" in
+case "${root}${root_unset}" in
     block:LABEL=*|LABEL=*)
         root="${root#block:}"
         root="$(echo $root | sed 's,/,\\x2f,g')"
@@ -75,7 +75,7 @@ case "$root" in
         rootok=1 ;;
 esac
 
-[ -z "$root" ] && die "Empty root= argument"
+[ -z "${root}${root_unset}" ] && die "Empty root= argument"
 [ -z "$rootok" ] && die "Don't know how to handle 'root=$root'"
 
 export root rflags fstype netroot NEWROOT