projects
/
grml-autoconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Additional check for boot option debian2hd in config_debootstrap().
[grml-autoconfig.git]
/
autoconfig.functions
diff --git
a/autoconfig.functions
b/autoconfig.functions
index
23b4015
..
d2baf4e
100755
(executable)
--- a/
autoconfig.functions
+++ b/
autoconfig.functions
@@
-1499,7
+1499,7
@@
config_mixer () {
fi
for card in $(cat /proc/asound/cards| grep -e '^\s*[0-9]' | awk '{print $1}') ; do
fi
for card in $(cat /proc/asound/cards| grep -e '^\s*[0-9]' | awk '{print $1}') ; do
- einfo "Configuring soundcard \"$(
cat /proc/asound/cards| awk -F\[ '/^ '$card'/{ FS=" "; $0=$2; print $1 }'
)\""
+ einfo "Configuring soundcard \"$(
awk -F\[ '/^ *'$card' \[/{ FS=" "; $0=$2; print $1}' < /proc/asound/cards
)\""
eindent
if checkbootparam 'vol' ; then
eindent
if checkbootparam 'vol' ; then
@@
-1920,6
+1920,9
@@
config_debs(){
if checkbootparam 'debs' ; then
iszsh && setopt localoptions shwordsplit
DEBS="$(getbootparam 'debs' 2>>$DEBUG)"
if checkbootparam 'debs' ; then
iszsh && setopt localoptions shwordsplit
DEBS="$(getbootparam 'debs' 2>>$DEBUG)"
+ if [ -z "$DEBS" ] ; then
+ DEBS="*"
+ fi
if ! echo $DEBS | grep -q '/'; then
# backwards compatibility: if no path is given get debs from debs/
DEBS="debs/$DEBS"
if ! echo $DEBS | grep -q '/'; then
# backwards compatibility: if no path is given get debs from debs/
DEBS="debs/$DEBS"
@@
-2375,7
+2378,7
@@
config_tohd()
# {{{ grml2hd: automatic installation
config_grml2hd(){
# {{{ grml2hd: automatic installation
config_grml2hd(){
-if checkbootparam "BOOT_IMAGE=grml2hd" ; then
+if checkbootparam "
grml2hd" || checkbootparam "
BOOT_IMAGE=grml2hd" ; then
if checkbootparam 'user' ; then
NEWUSER=''
if checkbootparam 'user' ; then
NEWUSER=''
@@
-2427,7
+2430,7
@@
fi # if checkbootparam "BOOT_IMAGE=grml2hd ...
# {{{ debootstrap: automatic installation
config_debootstrap(){
# {{{ debootstrap: automatic installation
config_debootstrap(){
-if checkbootparam "BOOT_IMAGE=debian2hd" ; then
+if checkbootparam "BOOT_IMAGE=debian2hd"
|| checkbootparam "debian2hd"
; then
einfo "Bootoption debian2hd found. Setting up environment for automatic installation via grml-debootstrap." ; eend 0
einfo "Bootoption debian2hd found. Setting up environment for automatic installation via grml-debootstrap." ; eend 0