projects
/
grml-autoconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drop $CMDLINE from grml-autoconfig; it's initialized from within autoconfig.functions
[grml-autoconfig.git]
/
grml-autoconfig
diff --git
a/grml-autoconfig
b/grml-autoconfig
index
8c69443
..
f57a890
100755
(executable)
--- a/
grml-autoconfig
+++ b/
grml-autoconfig
@@
-53,16
+53,11
@@
mount_pts
mount_sys
# }}}
mount_sys
# }}}
-# {{{ Read in boot parameters
-CMDLINE="$(cat /proc/cmdline)"
-[ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/* | tr '\n' ' ')"
-# }}}
-
# {{{ main grml-autoconfig
checkvalue $CONFIG_DEBUG && config_debug
SPLASH=''
# {{{ main grml-autoconfig
checkvalue $CONFIG_DEBUG && config_debug
SPLASH=''
-if checkbootparam
"textsplash" || checkbootparam "tsplash"
; then
+if checkbootparam
'textsplash' || checkbootparam 'tsplash'
; then
SPLASH=1
fi
SPLASH=1
fi
@@
-90,7
+85,7
@@
fi
checkvalue $CONFIG_SYSLOG && config_syslog
checkvalue $CONFIG_SYSLOG && config_syslog
-if checkbootparam
"forensic"
; then
+if checkbootparam
'forensic'
; then
ewarn "Bootopion forensic found. Important notice:" ; eend 0
ewarn " Do *NOT* boot with something like 'grml forensic ...' but always use 'forensic ...' instead!" ; eend 0
fi
ewarn "Bootopion forensic found. Important notice:" ; eend 0
ewarn " Do *NOT* boot with something like 'grml forensic ...' but always use 'forensic ...' instead!" ; eend 0
fi
@@
-205,15
+200,17
@@
checkvalue $CONFIG_EXTRACT && config_extract
checkvalue $CONFIG_HOMEDIR && config_homedir
checkvalue $CONFIG_HOMEDIR && config_homedir
-checkvalue $CONFIG_
MYCONFIG && config_myconfig
+checkvalue $CONFIG_
FINDDCSDIR && config_finddcsdir
checkvalue $CONFIG_DEBS && config_debs
checkvalue $CONFIG_SCRIPTS && config_scripts
checkvalue $CONFIG_DEBS && config_debs
checkvalue $CONFIG_SCRIPTS && config_scripts
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty14
+checkvalue $CONFIG_CONFIG && config_config
-checkvalue $CONFIG_CDROM_SCRIPTS && config_cdrom_scripts
+checkvalue $CONFIG_PARTCONF && config_partconf
+
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty14
# device symlinks {{{
[ -r /mnt/floppy ] || mkdir /mnt/floppy
# device symlinks {{{
[ -r /mnt/floppy ] || mkdir /mnt/floppy
@@
-257,8
+254,6
@@
checkvalue $CONFIG_915RESOLUTION && config_915resolution
checkvalue $CONFIG_IPW3945 && config_ipw3945
checkvalue $CONFIG_IPW3945 && config_ipw3945
-checkvalue $CONFIG_AUTOMOUNT && config_automount
-
checkvalue $CONFIG_MYPATH && config_mypath
checkvalue $CONFIG_DISTCC && config_distcc
checkvalue $CONFIG_MYPATH && config_mypath
checkvalue $CONFIG_DISTCC && config_distcc
@@
-290,6
+285,7
@@
fi
if [ -n "$BOOTDEBUG" ] ; then
CMDLINE="$(cat /proc/cmdline)"
[ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/*)"
if [ -n "$BOOTDEBUG" ] ; then
CMDLINE="$(cat /proc/cmdline)"
[ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/*)"
+ [ -d /live/image/bootparams/ ] && CMDLINE="$CMDLINE $(cat /live/image/bootparams/*)"
einfo "Bootoption debug detected. Printing kernel command line:"
echo "$CMDLINE"
fi
einfo "Bootoption debug detected. Printing kernel command line:"
echo "$CMDLINE"
fi