X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=grml-autoconfig;h=cd584f2e3a3d38449714b1f7cdb0e2e04a85230e;hp=9305cfe99641845e8d83a3d2a3e37e5defd696a6;hb=ec19b33413c8a79c9d65be0f2f4bb62436c690b9;hpb=12e47aed34dc3c59822af79dfec0a93fec810e00 diff --git a/grml-autoconfig b/grml-autoconfig index 9305cfe..cd584f2 100755 --- a/grml-autoconfig +++ b/grml-autoconfig @@ -59,7 +59,7 @@ 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 + 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 @@ -203,8 +203,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"