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=''
else
einfo "Could not mount $MOUNTDEVICE to /mnt/grml - sorry." ; eend 1
fi # mount $MOUNTDEVICE
+
grep -q '/mnt/grml' /proc/mounts && umount /mnt/grml
}
# 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
* 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