Skip to content

Commit

Permalink
Drop code related to scripts handling on DCSDIR, breaking it for GRML…
Browse files Browse the repository at this point in the history
…CFG 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.
  • Loading branch information
jimmy42 authored and mika committed Mar 20, 2014
1 parent bedd7c2 commit 11074bc
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions autoconfig.functions
Expand Up @@ -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
Expand Down

0 comments on commit 11074bc

Please sign in to comment.