[master/rhel7-branch] Fix error with OEMDRV ks auto-load check. (#1057271)

Samantha N. Bueno sbueno+anaconda at redhat.com
Wed Jul 29 18:26:11 UTC 2015


getarg returns an empty string if there is no argument to fetch; this
causes a problem since I originally checked the value against "none".
Oops.

Related: rhbz#1057271
---
 dracut/kickstart-genrules.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dracut/kickstart-genrules.sh b/dracut/kickstart-genrules.sh
index b5823f9..3dd7f89 100755
--- a/dracut/kickstart-genrules.sh
+++ b/dracut/kickstart-genrules.sh
@@ -25,7 +25,7 @@ case "${kickstart%%:*}" in
         warn "inst.ks: can't get kickstart - biospart (bd:) isn't supported yet"
     ;;
     "")
-        if [ -z "$kickstart" -a $(getarg ks= inst.ks=) != "none" ]; then
+        if [ -z "$kickstart" -a -z $(getarg ks= inst.ks=) ]; then
             when_diskdev_appears $(disk_to_dev_path LABEL=OEMDRV) \
                 fetch-kickstart-disk \$env{DEVNAME} "/ks.cfg"
         fi
-- 
1.9.3



More information about the anaconda-patches mailing list