From: Michael Prokop <mika@grml.org>
Date: Wed, 2 Apr 2014 09:30:09 +0000 (+0200)
Subject: Drop checks for "forensic" boot option
X-Git-Tag: v0.13.1~1
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=332eaaed6c4f1598b41408b8d4ade21cfed31374;hp=6abe325d632965f10310cae31eadfc852fdeaa62

Drop checks for "forensic" boot option

There's no need for checking for "forensic" boot option any longer,
since we can control all the boot options separately and the "forensic"
boot menu entry sets all the according boot options on its own
(see git commit 61d5ddd8de04 in grml-live.git).
---

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