From: Andreas "Jimmy" Gredler <jimmy@grml.org>
Date: Sat, 15 Mar 2014 17:13:47 +0000 (-0700)
Subject: Drop code related to scripts handling on DCSDIR, breaking it for GRMLCFG labeled... 
X-Git-Tag: v0.13.0~4
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=11074bcf4f264bd046a5f985a9853d094005f7f0

Drop code related to scripts handling on DCSDIR, breaking it for GRMLCFG labeled devices

Removed again an if clause in the function which finds DCSDIR. It was
redundant as this case is handled before and it broke the use case of
running scripts on a GRMLCFG labeled device. Because it changed to
$DCSDIR instead of $DCSDIR/scripts.
---

diff --git a/autoconfig.functions b/autoconfig.functions
index 34ff4f8..577e3b0 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -1737,11 +1737,6 @@ 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
-     SCRIPTS="$(cd ${DCSDIR}; /bin/ls -1d [Gg][Rr][Mm][Ll].[Ss][Hh] 2>>$DEBUG)"
-   fi
    if [ -n "$SCRIPTS" ]; then
      SCRIPTS="${DCSDIR}/$SCRIPTS"
      if [ "$DCSMP" = "/mnt/grmlcfg" ]; then