projects
/
grml-debootstrap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f84d7f6
)
Source specified configuration file at according stage.
author
Michael Prokop
<mika@grml.org>
Tue, 18 May 2010 11:45:54 +0000
(13:45 +0200)
committer
Michael Prokop
<mika@grml.org>
Tue, 18 May 2010 11:45:54 +0000
(13:45 +0200)
grml-debootstrap
patch
|
blob
|
history
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
8243192
..
653f16c
100755
(executable)
--- a/
grml-debootstrap
+++ b/
grml-debootstrap
@@
-93,16
+93,9
@@
check4progs debootstrap dialog || exit 1
check4root || exit 1
# }}}
check4root || exit 1
# }}}
-# source configuration file {{{
+# source
main
configuration file {{{
if [ -r /etc/debootstrap/config ] ; then
if [ -r /etc/debootstrap/config ] ; then
- if [ -n "$CONFIGFILE" ] ; then
- einfo "Using config file $CONFIGFILE."
- if ! . "$CONFIGFILE" ; then
- eerror "Error reading config file $CONFIGFILE" ; eend 1 ; exit 1
- fi
- else
- . /etc/debootstrap/config
- fi
+ . /etc/debootstrap/config
fi
# }}}
fi
# }}}
@@
-172,6
+165,15
@@
fi
}
# }}}
}
# }}}
+# source specified configuration file {{{
+if [ -n "$CONFIGFILE" ] ; then
+ einfo "Reading specified config file $CONFIGFILE."
+ if ! . "$CONFIGFILE" ; then
+ eerror "Error reading config file $CONFIGFILE" ; eend 1 ; exit 1
+ fi
+fi
+# }}}
+
# backwards compability checks {{{
if [ -n "$GROOT" ] ; then
echo "Error: you seem to have \$GROOT configured." >&2
# backwards compability checks {{{
if [ -n "$GROOT" ] ; then
echo "Error: you seem to have \$GROOT configured." >&2