From 548f8bed627ae726d66cdbf755261d9ebe06623e Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Thu, 12 May 2016 08:40:23 +0200
Subject: Fixes for the broken 'load/noload' boot parameters and rootcopy
 location.

Provided by GigglesUK, thanks.
---
 liveinit | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'liveinit')

diff --git a/liveinit b/liveinit
index e718742..05690d8 100755
--- a/liveinit
+++ b/liveinit
@@ -470,13 +470,13 @@ if [ "$RESCUE" = "" ]; then
         if [ "$SUBSYS" = "optional" ]; then
           # Load one or more optionals by using boot parameter 'load':
           # load=mod1[,mod2[,mod3]]
-          if [ -z "$LOAD" -o -z '$(echo ",${LOAD}," |grep -i ",$(echo $MODBASE |cut -d- -f2),")' ]; then
+          if [ -z "$LOAD" -o -z "$(echo ",${LOAD}," |grep -i ",$(echo $MODBASE |cut -d- -f2),")" ]; then
             continue
           fi
         elif [ "$SUBSYS" = "addons" ]; then
           # Skip loading one or more addons by using boot parameter 'noload':
           # noload=mod1[,mod2[,mod3]]
-          if [ -n "$NOLOAD" -a -n '$(echo ",${NOLOAD}," |grep -i ",$(echo $MODBASE |cut -d- -f2),")' ]; then
+          if [ -n "$NOLOAD" -a -n "$(echo ",${NOLOAD}," |grep -i ",$(echo $MODBASE |cut -d- -f2),")" ]; then
             echo "$MODBASE" >> /mnt/live/modules/skipped
             continue
           fi
-- 
cgit v1.2.3