X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=grml-autoconfig;h=b98c747f75100f04d78e11d87be393d80781edc4;hp=9305cfe99641845e8d83a3d2a3e37e5defd696a6;hb=0fb27baedd40895f6ab82017c3a3e137ee488955;hpb=12e47aed34dc3c59822af79dfec0a93fec810e00

diff --git a/grml-autoconfig b/grml-autoconfig
index 9305cfe..b98c747 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -56,13 +56,10 @@ mount_sys
 # {{{ main grml-autoconfig
 checkvalue $CONFIG_DEBUG && config_debug
 
-# update /etc/mtab if running in live-initramfs mode:
-if [ -z "$INSTALLED" -a -e /live/cow ] ; then
-   if ! grep -q rootfs /etc/mtab ; then
-      for i in rootfs "none /sys sysfs" proc /live/image /live/cow /lib/init/rw /dev/shm /dev/pts ; do
-          grep $i /proc/mounts | grep -v /dev/.static >> /etc/mtab
-      done
-   fi
+# make sure symlink /etc/mtab exists, this is usually handled by
+# /etc/init.d/checkroot.sh but we don't execute this script on the live system
+if [ -z "$INSTALLED" ] ; then
+  ln -sf /proc/mounts /etc/mtab
 fi
 
 stage=5
@@ -87,26 +84,14 @@ checkvalue $CONFIG_LANGUAGE && config_language
 
 checkvalue $CONFIG_LOG && config_log
 
-checkvalue $CONFIG_FWTIMEOUT && config_fwtimeout
-
-checkvalue $CONFIG_FIX_PASSWD && config_fix_passwd
-
 checkvalue $CONFIG_HOSTNAME && config_hostname
 
-checkvalue $CONFIG_CONFIGFS && config_configfs
-
 checkvalue $CONFIG_TIME && config_time
 
 checkvalue $CONFIG_KERNEL &&  config_kernel
 
-checkvalue $CONFIG_SMALL && config_small
-
-checkvalue $CONFIG_LD_MOD && config_ld_mod
-
 checkvalue $CONFIG_TIMEZONE && config_timezone
 
-checkvalue $CONFIG_FAST && config_fast
-
 checkvalue $CONFIG_SWRAID && config_swraid
 
 checkvalue $CONFIG_DMRAID && config_dmraid
@@ -118,18 +103,12 @@ echo "0" > /proc/sys/kernel/printk
 
 checkvalue $CONFIG_TESTCD && config_testcd
 
-checkvalue $CONFIG_MODULES && config_modules
-
 checkvalue $CONFIG_BRLTTY && config_brltty
 
 checkvalue $CONFIG_ACPI && config_acpi
 
-checkvalue $CONFIG_DMA && config_dma
-
 checkvalue $CONFIG_FSTAB && config_fstab
 
-checkvalue $CONFIG_MOUSE && config_mouse
-
 checkvalue $CONFIG_CPU && config_cpu
 
 checkvalue $CONFIG_SSH && config_ssh
@@ -154,12 +133,6 @@ checkvalue $CONFIG_PARTCONF && config_partconf
 
 checkvalue $CONFIG_MIXER && config_mixer
 
-checkvalue $CONFIG_MODEM && config_modem
-
-checkvalue $CONFIG_WONDERSHAPER && config_wondershaper
-
-checkvalue $CONFIG_GPM && config_gpm
-
 checkvalue $CONFIG_SERVICES && config_services
 
 checkvalue $CONFIG_DEBNET && config_debnet
@@ -170,26 +143,18 @@ checkvalue $CONFIG_NETCONFIG && config_netconfig
 
 checkvalue $CONFIG_NETSCRIPT && config_netscript
 
-checkvalue $CONFIG_NETIPV6 && config_ipv6
-
 checkvalue $CONFIG_STATS && config_stats
 
 checkvalue $CONFIG_CONSOLE && config_console
 
-checkvalue $CONFIG_FIX_UNIONFS && fix_unionfs
-
 checkvalue $CONFIG_VIRTUALBOX_SHARED_FOLDERS && config_virtualbox_shared_folders
 
 checkvalue $CONFIG_MYPATH && config_mypath
 
-checkvalue $CONFIG_DISTCC && config_distcc
-
 checkvalue $CONFIG_DISTRI && config_distri
 
 checkvalue $CONFIG_BLANKING && config_blanking
 
-checkvalue $CONFIG_TOHD && config_tohd
-
 checkvalue $CONFIG_DEBOOTSTRAP && config_debootstrap
 
 checkvalue $CONFIG_XSTARTUP && config_x_startup
@@ -203,8 +168,7 @@ if [ -n "$BOOTDEBUG" ] ; then
    # set only if not already set
    if [ -z "$CMDLINE" ] ; then
      CMDLINE="$(cat /proc/cmdline)"
-     [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/*)"
-     [ -d /live/image/bootparams/ ] && CMDLINE="$CMDLINE $(cat /live/image/bootparams/*)"
+     [ -d ${LIVECD_PATH}/bootparams/ ] && CMDLINE="$CMDLINE $(cat ${LIVECD_PATH}/bootparams/*)"
    fi
    einfo "Bootoption debug detected. Printing kernel command line:"
    echo "$CMDLINE"