X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=grml-autoconfig;h=c0c1d4786ab6ec484e8b5d55de527d10159cba53;hp=7ef820e642935c98ef425ec79b702b3b889457bd;hb=9e95af677f3f9fc2be8529b76875678fca8d80d6;hpb=d694c20c01f73f9224b7a6f0495656ddc32b27fb

diff --git a/grml-autoconfig b/grml-autoconfig
index 7ef820e..c0c1d47 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -32,7 +32,7 @@ fi
 # }}}
 
 # {{{ path, signals, umask, zsh, colors
-export PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin"
+export PATH="/bin:/sbin:/usr/bin:/usr/sbin"
 umask 022
 # Ignore these signals: INT, TERM, SEGV
 trap "" 2 3 11
@@ -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
@@ -93,7 +90,7 @@ checkvalue $CONFIG_FIX_PASSWD && config_fix_passwd
 
 checkvalue $CONFIG_HOSTNAME && config_hostname
 
-checkvalue $CONFIG_USERFSTAB && config_userfstab
+checkvalue $CONFIG_CONFIGFS && config_configfs
 
 checkvalue $CONFIG_TIME && config_time
 
@@ -116,12 +113,12 @@ checkvalue $CONFIG_LVM && config_lvm
 # No kernel messages while probing modules
 echo "0" > /proc/sys/kernel/printk
 
-checkvalue $CONFIG_LOCAL_NET && config_local_net
-
 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
@@ -152,12 +149,6 @@ checkvalue $CONFIG_FINDDCSDIR && config_umount_dcsdir
 
 checkvalue $CONFIG_PARTCONF && config_partconf
 
-# device symlinks {{{
-  [ -r /mnt/floppy ] || mkdir /mnt/floppy
-  [ -r /mnt/cdrom ]  || mkdir /mnt/cdrom
-  [ -r /mnt/test ]   || mkdir /mnt/test
-# }}}
-
 checkvalue $CONFIG_MIXER && config_mixer
 
 checkvalue $CONFIG_MODEM && config_modem
@@ -166,15 +157,19 @@ checkvalue $CONFIG_WONDERSHAPER && config_wondershaper
 
 checkvalue $CONFIG_GPM && config_gpm
 
+checkvalue $CONFIG_SERVICES && config_services
+
+checkvalue $CONFIG_DEBNET && config_debnet
+
+checkvalue $CONFIG_DISPLAY_SSH_FINGERPRINTS && config_display_ssh_fingerprints
+
 checkvalue $CONFIG_NETCONFIG && config_netconfig
 
 checkvalue $CONFIG_NETSCRIPT && config_netscript
 
-checkvalue $CONFIG_SERVICES && config_services
-
 checkvalue $CONFIG_NETIPV6 && config_ipv6
 
-checkvalue $CONFIG_DEBNET && config_debnet
+checkvalue $CONFIG_STATS && config_stats
 
 checkvalue $CONFIG_CONSOLE && config_console
 
@@ -205,8 +200,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"