projects
/
grml-autoconfig.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b663511
)
Add fallback in config_scripts
mru/find_scripts
author
Ulrich Dangel
<mru@grml.org>
Tue, 6 Sep 2011 07:10:36 +0000
(09:10 +0200)
committer
Ulrich Dangel
<mru@grml.org>
Tue, 6 Sep 2011 07:10:36 +0000
(09:10 +0200)
autoconfig.functions
patch
|
blob
|
history
diff --git
a/autoconfig.functions
b/autoconfig.functions
index
3d5410e
..
9d1104f
100755
(executable)
--- a/
autoconfig.functions
+++ b/
autoconfig.functions
@@
-1720,9
+1720,8
@@
if checkbootparam 'scripts' || [ "$DCSMP" = "/mnt/grmlcfg" ]; then
# backwards compatibility: if no path is given get scripts from scripts/
SCRIPTS="scripts/$SCRIPTS"
fi
# backwards compatibility: if no path is given get scripts from scripts/
SCRIPTS="scripts/$SCRIPTS"
fi
- if [ "$DCSMP" = "/mnt/grmlcfg" ]; then
- # we are executing from a GRMLCFG labeled fs
- # kick everything we have done before and start over
+ if [ -z "$SCRIPTS" ]; then
+ # Fallback to test if DSCDIR/grml.sh exists
SCRIPTS="$(cd ${DCSDIR}; /bin/ls -1d [Gg][Rr][Mm][Ll].[Ss][Hh] 2>>$DEBUG)"
fi
if [ -n "$SCRIPTS" ]; then
SCRIPTS="$(cd ${DCSDIR}; /bin/ls -1d [Gg][Rr][Mm][Ll].[Ss][Hh] 2>>$DEBUG)"
fi
if [ -n "$SCRIPTS" ]; then