From c7daf185362f47217661a1c137cc0f9583258473 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Wed, 20 May 2009 18:13:21 +0200
Subject: [PATCH] Improve ""Sorry, could not find file ..." message

---
 autoconfig.functions | 10 ++++++----
 debian/changelog     |  4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/autoconfig.functions b/autoconfig.functions
index 787252a..8761936 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -1929,17 +1929,19 @@ if [[ $RC == 0 ]]; then
    CONFIG="$(/bin/ls -1d /mnt/grml/[Cc][Oo][Nn][Ff][Ii][Gg].[Tt][Bb][Zz] 2>>$DEBUG)"
    if checkbootparam config ; then
       FILENAME="$(getbootparam 'config' 2>>$DEBUG)"
-      if [ -e /mnt/grml/${FILENAME} ] ; then
+      if [ -e /mnt/grml/"${FILENAME}" ] ; then
          einfo "Using /mnt/grml/$FILENAME instead of config.tbz"
-         CONFIG="/mnt/grml/$FILENAME"
+         CONFIG="/mnt/grml/${FILENAME}"
       fi
+   else
+      FILENAME="$(basename $CONFIG)"
    fi
    if [ -n "$CONFIG" ]; then
      einfo "Found file ${WHITE}${CONFIG}${NORMAL} - trying to extract it."
      cd /
      unp $CONFIG $EXTRACTOPTIONS ; eend $?
    else
-     ewarn "Sorry, could not find file $FILENAME on device $MOUNTDEVICE $MESSAGE label GRMLCFG." ; eend 1
+     ewarn "Sorry, could not find file ${FILENAME} on device ${MOUNTDEVICE} ${MESSAGE}." ; eend 1
    fi
 
    SCRIPT=''
@@ -1952,6 +1954,7 @@ if [[ $RC == 0 ]]; then
    else
    einfo "Could not mount $MOUNTDEVICE to /mnt/grml - sorry." ; eend 1
 fi # mount $MOUNTDEVICE
+
 grep -q '/mnt/grml' /proc/mounts && umount /mnt/grml
 
 }
@@ -1966,7 +1969,6 @@ else
    # We do need the following fix so floppy disk is available to blkid in any case :-/
      if [ -r /dev/fd0 ] ; then
         einfo "Floppy device detected. Trying to access floppy disk."
-   #     dd if=/dev/fd0 of=/dev/null bs=512 count=1 1>>$DEBUG 2>&1
         if timeout 4 dd if=/dev/fd0 of=/dev/null bs=512 count=1 1>>$DEBUG 2>&1 ; then
            blkid /dev/fd0 1>>$DEBUG 2>&1
         fi
diff --git a/debian/changelog b/debian/changelog
index a24de2a..dcba68f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ grml-autoconfig (0.8.22) unstable; urgency=low
 
   * Fix bootoption "ssh": current versions of chpasswd don't support
     option '-m' anymore (foo, this sucks!). [Testing: issue671]
+  * Improve ""Sorry, could not find file ..." message if there isn't
+    any config.tbz present. [Testing: issue670]
 
- -- Michael Prokop <mika@grml.org>  Wed, 20 May 2009 18:02:23 +0200
+ -- Michael Prokop <mika@grml.org>  Wed, 20 May 2009 18:12:44 +0200
 
 grml-autoconfig (0.8.21) unstable; urgency=low
 
-- 
2.1.4