projects
/
grml-autoconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop checks for "forensic" boot option
[grml-autoconfig.git]
/
autoconfig.functions
diff --git
a/autoconfig.functions
b/autoconfig.functions
index
577e3b0
..
3694475
100755
(executable)
--- 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"
# 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
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
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' || \
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
ewarn "Skipping SW-RAID code as requested on boot commandline." ; eend 0
else
[ -e /proc/mdstat ] || modprobe md_mod