Skip to content

Commit

Permalink
Use psubdir= instead hardcoded live folder
Browse files Browse the repository at this point in the history
  • Loading branch information
MintPup committed Aug 21, 2017
1 parent 469d574 commit f92e64f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions porteus-boot/linuxrc
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ NOLOAD=`value noload | sed 's/;/|/g'`; [ $NOLOAD ] || NOLOAD=._null
EXTRAMOD=`value extramod | sed 's/;/ /g'`
RAMMOD=`value rammod | sed 's/;/|/g'`
ROOTCOPY=`value rootcopy`
FOLDER=live
FOLDER="`value psubdir`" || FOLDER=live ###saintless - use psubdir= instead always depending on live (mod from linuxrc in in PuppyRus-A from sfs).
livedbg=/var/log/livedbg

# Device Functions:
Expand Down Expand Up @@ -181,9 +181,9 @@ elif [ $ISO ]; then SGNDEV=/mnt/isoloop
locate -e $FROM && { BOOTDEV=/mnt/$DEV; mkdir /mnt/isoloop; mount -o loop /mnt/$DEV/$LPTH /mnt/isoloop; }
else
if [ $FROM ]; then
locate -e $FROM/live/$SGN
locate -e $FROM/$FOLDER/$SGN
if [ $? -eq 0 ]; then
DIR=`echo $LPTH | rev | cut -d/ -f3- | rev`; [ $DIR ] && FOLDER=$DIR/live
DIR=`echo $LPTH | rev | cut -d/ -f3- | rev`; [ $DIR ] && FOLDER=$DIR/$FOLDER
else
echo $i"from= cheatcode is incorrect, press enter to search through all devices"
read -s; search -e live/$SGN
Expand Down

0 comments on commit f92e64f

Please sign in to comment.