Correcting --nodebconfig parameter handling.
authorDaniel Baumann <daniel@debian.org>
Fri, 18 Jan 2013 13:39:25 +0000 (14:39 +0100)
committerDaniel Baumann <daniel@debian.org>
Fri, 18 Jan 2013 13:39:25 +0000 (14:39 +0100)
bin/live-debconfig
scripts/debconfig/multiselect

index 6cda43e..a9eb91b 100755 (executable)
@@ -45,7 +45,7 @@ Cmdline ()
 
                        --nodebconfig)
                                # Don't run any script
-                               _SCRIPTS=""
+                               _SCRIPTS="nodebconfig"
                                ;;
 
                        # Special options
@@ -77,7 +77,7 @@ Cmdline ()
        then
                for _NODEBCONFIG in $(echo ${LIVE_NODEBCONFIGS} | sed -e 's|,| |g')
                do
-                       _SCRIPTS="$(echo ${_SCRIPTS} | sed -e "s|$(ls /lib/live/debconfig/????-${_NODEBCONFIG} 2> /dev/null || echo none)||")"
+                       _SCRIPTS="$(echo ${_SCRIPTS} | sed -e "s|$(ls /lib/live/debconfig/????-${_NODEBCONFIG} 2> /dev/null || echo nodebconfig)||")"
                done
        fi
 }
index 81961aa..69d0378 100755 (executable)
@@ -25,10 +25,15 @@ then
        db_subst live-debconfig/scripts CHOICES "${_SCRIPTS}"
        db_subst live-debconfig/scripts CHOICES_C "${_SCRIPTS_C}"
 
-       if [ -n "${_CMDLINE}" ]
-       then
-               db_set live-debconfig/scripts ${_CMDLINE}
-       fi
+       case "${_CMDLINE}" in
+               nodebconfig)
+                       db_set live-debconfig/scripts 
+                       ;;
+
+               *)
+                       db_set live-debconfig/scripts ${_CMDLINE}
+                       ;;
+       esac
 
        db_fset live-debconfig/scripts seen false