From 11074bcf4f264bd046a5f985a9853d094005f7f0 Mon Sep 17 00:00:00 2001 From: "Andreas \"Jimmy\" Gredler" Date: Sat, 15 Mar 2014 10:13:47 -0700 Subject: [PATCH] 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. --- autoconfig.functions | 5 ----- 1 file changed, 5 deletions(-) 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 -- 2.1.4