X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=f30668ac51f6c028ca98d05e3b479777970bf77e;hp=386ac40eb46b9505a002b3ea7a68498e6a071a7b;hb=c13a5d8cb3b66d6903089474649649336ccd090c;hpb=27f84387af177979e83884744f9e3e5b0778136c diff --git a/autoconfig.functions b/autoconfig.functions index 386ac40..f30668a 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -1920,6 +1920,9 @@ config_debs(){ if checkbootparam 'debs' ; then iszsh && setopt localoptions shwordsplit DEBS="$(getbootparam 'debs' 2>>$DEBUG)" + if [ -z "$DEBS" ] ; then + DEBS="*.deb" + fi if ! echo $DEBS | grep -q '/'; then # backwards compatibility: if no path is given get debs from debs/ DEBS="debs/$DEBS" @@ -2375,7 +2378,7 @@ config_tohd() # {{{ grml2hd: automatic installation config_grml2hd(){ -if checkbootparam "BOOT_IMAGE=grml2hd" ; then +if checkbootparam "grml2hd" || checkbootparam "BOOT_IMAGE=grml2hd" ; then if checkbootparam 'user' ; then NEWUSER='' @@ -2427,7 +2430,7 @@ fi # if checkbootparam "BOOT_IMAGE=grml2hd ... # {{{ debootstrap: automatic installation config_debootstrap(){ -if checkbootparam "BOOT_IMAGE=debian2hd" ; then +if checkbootparam "BOOT_IMAGE=debian2hd" || checkbootparam "debian2hd" ; then einfo "Bootoption debian2hd found. Setting up environment for automatic installation via grml-debootstrap." ; eend 0