projects
/
grml-autoconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modify wget parameter to only try once to download given config
[grml-autoconfig.git]
/
autoconfig.functions
diff --git
a/autoconfig.functions
b/autoconfig.functions
index
50fdf81
..
3c594cf
100755
(executable)
--- a/
autoconfig.functions
+++ b/
autoconfig.functions
@@
-47,10
+47,14
@@
fi
# Get a bootoption's parameter: read boot command line and either
# echo last parameter's argument or return false.
getbootparam(){
# Get a bootoption's parameter: read boot command line and either
# echo last parameter's argument or return false.
getbootparam(){
- case "$CMDLINE" in
- *$1=*)
- result="${CMDLINE##* $1=}"
- result="${result%%[ ]*}"
+ local line
+ local ws
+ ws=' '
+ line=" $CMDLINE "
+ case "$line" in
+ *[${ws}]"$1="*)
+ result="${line##*[$ws]$1=}"
+ result="${result%%[$ws]*}"
echo "$result"
return 0 ;;
*) # no match?
echo "$result"
return 0 ;;
*) # no match?
@@
-61,13
+65,16
@@
getbootparam(){
# Check boot commandline for specified option
checkbootparam(){
[ -n "$1" ] || ( echo "Error: missing argument to checkbootparam()" ; return 1 )
# Check boot commandline for specified option
checkbootparam(){
[ -n "$1" ] || ( echo "Error: missing argument to checkbootparam()" ; return 1 )
- # make sure we match beginning and end of line as well
- # but don't match 'vg' if we want to check for 'vga'
- if echo "$CMDLINE" | grep -qw "$1" ; then
- return 0
- else
- return 1
- fi
+ local line
+ local ws
+ ws=' '
+ line=" $CMDLINE "
+ case "$line" in
+ *[${ws}]"$1"=*|*[${ws}]"$1"[${ws}]*)
+ return 0 ;;
+ *)
+ return 1 ;;
+ esac
}
# Check wheter a configuration variable (like $CONFIG_TOHD) is
}
# Check wheter a configuration variable (like $CONFIG_TOHD) is
@@
-1792,7
+1799,7
@@
config_netconfig(){
CONFIGFILE='/tmp/netconfig.grml'
getconfig() {
CONFIGFILE='/tmp/netconfig.grml'
getconfig() {
- wget --timeout=10 --dns-timeout=10 --connect-timeout=10 \
+ wget --timeout=10 --dns-timeout=10 --connect-timeout=10
--tries=1
\
--read-timeout=10 $CONFIG -O $CONFIGFILE && return 0 || return 1
}
einfo "Trying to get ${WHITE}${CONFIG}${NORMAL}"
--read-timeout=10 $CONFIG -O $CONFIGFILE && return 0 || return 1
}
einfo "Trying to get ${WHITE}${CONFIG}${NORMAL}"
@@
-1951,6
+1958,8
@@
else
fi
DCSDIR="/mnt/grml"
fi
fi
DCSDIR="/mnt/grml"
fi
+ else
+ DCSDIR="/live/image"
fi
fi
fi
fi
fi
fi