From: Ulrich Dangel <mru@grml.org>
Date: Tue, 6 Sep 2011 07:10:36 +0000 (+0200)
Subject: Add fallback in config_scripts
X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=refs%2Fheads%2Fmru%2Ffind_scripts

Add fallback in config_scripts
---

diff --git a/autoconfig.functions b/autoconfig.functions
index 3d5410e..9d1104f 100755
--- 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
-   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