projects
/
grml-autoconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve ""Sorry, could not find file ..." message
[grml-autoconfig.git]
/
autoconfig.functions
diff --git
a/autoconfig.functions
b/autoconfig.functions
index
af4ce8a
..
8761936
100755
(executable)
--- a/
autoconfig.functions
+++ b/
autoconfig.functions
@@
-1464,7
+1464,12
@@
if checkbootparam ssh ; then
# finally check if we have a password we can use:
if [ -n "$SSH_PASSWD" ] ; then
# finally check if we have a password we can use:
if [ -n "$SSH_PASSWD" ] ; then
- echo "grml:$SSH_PASSWD" | chpasswd -m
+ # chpasswd sucks, seriously.
+ if chpasswd --help 2>&1 | grep -q -- '-m,' ; then
+ echo "grml:$SSH_PASSWD" | chpasswd -m
+ else
+ echo "grml:$SSH_PASSWD" | chpasswd
+ fi
fi
einfo 'Starting secure shell server in background.'
fi
einfo 'Starting secure shell server in background.'
@@
-1924,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)"
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"
einfo "Using /mnt/grml/$FILENAME instead of config.tbz"
- CONFIG="/mnt/grml/$
FILENAME
"
+ CONFIG="/mnt/grml/$
{FILENAME}
"
fi
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
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=''
fi
SCRIPT=''
@@
-1947,6
+1954,7
@@
if [[ $RC == 0 ]]; then
else
einfo "Could not mount $MOUNTDEVICE to /mnt/grml - sorry." ; eend 1
fi # mount $MOUNTDEVICE
else
einfo "Could not mount $MOUNTDEVICE to /mnt/grml - sorry." ; eend 1
fi # mount $MOUNTDEVICE
+
grep -q '/mnt/grml' /proc/mounts && umount /mnt/grml
}
grep -q '/mnt/grml' /proc/mounts && umount /mnt/grml
}
@@
-1961,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."
# 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
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