projects
/
grml-autoconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update changelog regarding issue715 and for new release
[grml-autoconfig.git]
/
grml-autoconfig
diff --git
a/grml-autoconfig
b/grml-autoconfig
index
8c69443
..
7e46b47
100755
(executable)
--- a/
grml-autoconfig
+++ b/
grml-autoconfig
@@
-53,11
+53,6
@@
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
# {{{ main grml-autoconfig
checkvalue $CONFIG_DEBUG && config_debug
@@
-205,12
+200,16
@@
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
+checkvalue $CONFIG_CONFIG && config_config
+
+checkvalue $CONFIG_PARTCONF && config_partconf
+
[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty14
checkvalue $CONFIG_CDROM_SCRIPTS && config_cdrom_scripts
[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty14
checkvalue $CONFIG_CDROM_SCRIPTS && config_cdrom_scripts
@@
-257,8
+256,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
+287,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