From e65b6fdf2adb2cc5742bac38ad09ca060b8f9a9f Mon Sep 17 00:00:00 2001 From: Ulrich Dangel Date: Mon, 18 Apr 2011 21:44:43 +0200 Subject: [PATCH] Quote $DCSMP to check if DCSMP was mounted. Thanks to K. Wulff for the the bug report. --- autoconfig.functions | 10 +++++++--- grml-autoconfig | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/autoconfig.functions b/autoconfig.functions index 87117db..01350dd 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -1947,9 +1947,13 @@ if checkbootparam 'config' || [ "$DCSMP" = "/mnt/grmlcfg" ]; then fi fi fi -# umount $DCSMP if it was mounted by finddcsdir -# this doesn't really belong here -grep -q '$DCSMP' /proc/mounts && umount $DCSMP +} +# }}} + +# {{{ confing_umount_dcsdir +config_umount_dcsdir(){ + # umount $DCSMP if it was mounted by finddcsdir + grep -q "$DCSMP" /proc/mounts && umount "$DCSMP" } # }}} diff --git a/grml-autoconfig b/grml-autoconfig index d19c184..fd6e73e 100755 --- a/grml-autoconfig +++ b/grml-autoconfig @@ -198,6 +198,8 @@ checkvalue $CONFIG_CONFIG && config_config checkvalue $CONFIG_SCRIPTS && config_scripts +checkvalue $CONFIG_FINDDCSDIR && config_umount_dcsdir + checkvalue $CONFIG_PARTCONF && config_partconf [ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty14 -- 2.1.4