X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=19e74590a6f452d4f566c1e6a891162c0afcb318;hp=06265e8de32e3a859e575e511745d0fe81ec3c0a;hb=02c0126afa706977c2c7941945b24c487a13bd57;hpb=12e47aed34dc3c59822af79dfec0a93fec810e00 diff --git a/autoconfig.functions b/autoconfig.functions index 06265e8..19e7459 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -1570,6 +1570,7 @@ DCSMP="/mnt/grml" GRMLCFG="$(getbootparam 'autoconfig' 2>>$DEBUG)" [ -n "$GRMLCFG" ] || GRMLCFG="GRMLCFG" if checkbootparam 'noautoconfig' || checkbootparam 'forensic' ; then + DCSDIR="/live/image" # set default so it works for "scripts" boot option as expected ewarn "Skipping running automount of device(s) labeled $GRMLCFG as requested." ; eend 0 else if [ -z "$INSTALLED" ] ; then @@ -1703,7 +1704,7 @@ if checkbootparam 'scripts' || [ "$DCSMP" = "/mnt/grmlcfg" ]; then sh -c $SCRIPTS elif [ -d "$SCRIPTS" ]; then einfo "Bootparameter scripts found. Trying to execute from directory ${SCRIPTS}:" - run-parts $SCRIPTS + run-parts --regex '.*' $SCRIPTS else einfo "Bootparameter scripts found. Trying to execute ${SCRIPTS}:" sh -c $SCRIPTS