X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=grml-autoconfig;h=7e46b47f85920945f5fe518c015d0f7b9803daaa;hb=b9e2bd50c1b33dd544d0c0ddacc58376bdc3c0f3;hp=2c97dbcc6298de58c61bbbd71e1403969912c36e;hpb=39eccfccd198ed1b2b1c6d29f9328b6dfbb8000b;p=grml-autoconfig.git diff --git a/grml-autoconfig b/grml-autoconfig index 2c97dbc..7e46b47 100755 --- a/grml-autoconfig +++ b/grml-autoconfig @@ -53,12 +53,6 @@ mount_pts mount_sys # }}} -# {{{ Read in boot parameters -CMDLINE="$(cat /proc/cmdline)" -[ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/* | tr '\n' ' ')" -[ -d /live/image/bootparams/ ] && CMDLINE="$CMDLINE $(cat /live/image/bootparams/* | tr '\n' ' ')" -# }}} - # {{{ main grml-autoconfig checkvalue $CONFIG_DEBUG && config_debug @@ -206,12 +200,16 @@ checkvalue $CONFIG_EXTRACT && config_extract 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_CONFIG && config_config + +checkvalue $CONFIG_PARTCONF && config_partconf + [ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty14 checkvalue $CONFIG_CDROM_SCRIPTS && config_cdrom_scripts @@ -258,8 +256,6 @@ checkvalue $CONFIG_915RESOLUTION && config_915resolution checkvalue $CONFIG_IPW3945 && config_ipw3945 -checkvalue $CONFIG_AUTOMOUNT && config_automount - checkvalue $CONFIG_MYPATH && config_mypath checkvalue $CONFIG_DISTCC && config_distcc