X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=3694475f03c6d93b0b21b7cecc1da70a8b1e2bc5;hp=577e3b0a832dfab4002893771d3cbd3158541540;hb=332eaaed6c4f1598b41408b8d4ade21cfed31374;hpb=11074bcf4f264bd046a5f985a9853d094005f7f0 diff --git a/autoconfig.functions b/autoconfig.functions index 577e3b0..3694475 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -1621,7 +1621,7 @@ DCSMP="/mnt/grml" # autoconfig, see issue673 GRMLCFG="$(getbootparam 'autoconfig' 2>>$DEBUG)" [ -n "$GRMLCFG" ] || GRMLCFG="GRMLCFG" -if checkbootparam 'noautoconfig' || checkbootparam 'forensic' ; then +if checkbootparam 'noautoconfig' ; then DCSDIR="${LIVECD_PATH}" # 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 @@ -1918,9 +1918,8 @@ fi config_swraid(){ [ -n "$INSTALLED" ] && return 0 - # notice: checkbootparam "forensic" is just for users who don't know how to really use the bootoption if checkbootparam 'noraid' || checkbootparam 'noswraid' || \ - checkbootparam 'forensic' || checkbootparam 'raid=noautodetect' ; then + checkbootparam 'raid=noautodetect' ; then ewarn "Skipping SW-RAID code as requested on boot commandline." ; eend 0 else [ -e /proc/mdstat ] || modprobe md_mod