X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=grml-autoconfig;h=224adf6fd8ce1e6078abcf07d1d7ad83c94ece9e;hp=cd584f2e3a3d38449714b1f7cdb0e2e04a85230e;hb=4612d930c00d300148a7e191356f4f543150ec07;hpb=ec19b33413c8a79c9d65be0f2f4bb62436c690b9

diff --git a/grml-autoconfig b/grml-autoconfig
index cd584f2..224adf6 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 ${LIVECD_PATH} /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
@@ -124,8 +121,6 @@ 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