(old)Puppy Linux Discussion Forum

Code: Select all

sfs_load -LP2_GThumb-2.11.2.1.sfs

Code: Select all

--- a/usr/sbin/extrasfsfind
+++ b/usr/sbin/extrasfsfind
@@ -80,7 +80,7 @@
 skiploaded() {
 	FOUND=$(echo "$FOUND"| grep '.')	#v1.9.4 renove blank line
 	[ "$FOUND" ] || return
-	for F in $SFSBASE $ZDRBASE $ADRBASE $LASTUNIONRECORD; do
+	for F in $SFSBASE $ZDRBASE $ADRBASE $YDRBASE $LASTUNIONRECORD; do
 	  FOUND=$(echo "$FOUND"| grep -v $F)
 	done
    FOUND=$(echo "$FOUND"| grep '.')	#v1.9.4 renove blank line
@@ -166,6 +166,10 @@
 ADRPART=$(echo $ADRV|cut -d',' -f1)
 ADRFILE=$(echo $ADRV|cut -d',' -f3)
 ADRBASE=$(basename "$ADRFILE")
+#ydrv support
+YDRPART=$(echo $YDRV|cut -d',' -f1)
+YDRFILE=$(echo $YDRV|cut -d',' -f3)
+YDRBASE=$(basename "$YDRFILE")
 
 # does not support without the sfs_load
 if [ -z "$SFSLOAD" ]; then

Code: Select all

--- /usr/sbin/sfs_load	2015-10-28 22:33:53.000000000 +1000
+++ sfs_load	2016-06-06 04:31:15.752845260 +1000
@@ -607,6 +607,7 @@
   [ "$F" = "$ZDRBASE" ] && return 1
   [ "$F" = "$ADRBASE" ] && return 1	#v1.9.2
   [ "$F" = "$YDRBASE" ] && return 1	#v2.0.8
+  [ "$F" = "$FDRBASE" ] && return 1
   echo "$LOADEDLIST" | grep -qw "$F" && return 1  # already listed
   if [ "$LOADEDLIST" = "" ]; then
     LOADEDLIST="$F$Q"
@@ -749,6 +750,7 @@
   [ "${DISTRO_ZDRVSFS}" ] && [ "`echo "$BASEONESFS" | grep "^${DISTRO_ZDRVSFS}"`" != "" ] && continue #100913
   [ "${DISTRO_ADRVSFS}" ] && [ "`echo "$BASEONESFS" | grep "^${DISTRO_ADRVSFS}"`" != "" ] && continue #v1.9.2: saluki
   [ "${DISTRO_YDRVSFS}" ] && [ "`echo "$BASEONESFS" | grep "^${DISTRO_YDRVSFS}"`" != "" ] && continue #v2.0.11
+  [ "${DISTRO_FDRVSFS}" ] && [ "`echo "$BASEONESFS" | grep "^${DISTRO_FDRVSFS}"`" != "" ] && continue #v1.9.2: saluki
   #w020 other compat-distro sfs need to be eliminated...
   [ "`echo "$BASEONESFS" | grep '\\-[0-9][0-9][0-9]\\.sfs' | grep -v "$DISTRO_VERSION"`" != "" ] && continue
   #echo $EXTRASFSLIST | grep -q "$BASEONESFS" && continue # remove already loaded
@@ -1445,7 +1447,7 @@
   #v1.9.1, #v2.0: do not register zdrv #v2.0.11: ditto adrv and ydrv
   #v2.1.8: avoid dup. in EXTRASFSLIST
   case "$FILENAME" in
-  $DISTRO_ZDRVSFS|$DISTRO_ADRVSFS|$DISTRO_YDRVSFS) :;;
+  $DISTRO_ZDRVSFS|$DISTRO_ADRVSFS|$DISTRO_YDRVSFS|$DISTRO_FDRVSFS) :;;
   *) echo $EXTRASFSLIST | grep -qw "$FILENAME" || EXTRASFSLIST="$EXTRASFSLIST $FILENAME";;
   esac
   LASTUNIONRECORD="$LASTUNIONRECORD $FILENAME"
@@ -2020,7 +2022,7 @@
     [ $N -le $MAXEXTRANUM ] && exit	#v2.0.9, v2.1.8
     if [ $MAXEXTRANUM -eq 0 ]; then
       EXTRASFSLIST=""
-      LASTUNIONRECORD=$(echo $LASTUNIONRECORD | tr ' ' "\n" | grep -E "^(${DISTRO_FILE_PREFIX}save|$DISTRO_PUPPYSFS|zdrv|adrv|ydrv)"| tr "\n" ' ')
+      LASTUNIONRECORD=$(echo $LASTUNIONRECORD | tr ' ' "\n" | grep -E "^(${DISTRO_FILE_PREFIX}save|$DISTRO_PUPPYSFS|zdrv|fdrv|adrv|ydrv)"| tr "\n" ' ')
       save_bootconfig
       exit
     fi
@@ -2271,7 +2273,7 @@
 if [ "$ALINE" ]; then
   #v2.0: fix zdrv, adrv #2.0.8 ydrv
   case "$FILENAME" in
-   $SFSBASE|$ZDRBASE|$ADRBASE|$YDRBASE) fatal $(printf "$(gettext "'%s' is the system file and cannot be removed.")" "$FILENAME");;
+   $SFSBASE|$ZDRBASE|$ADRBASE|$YDRBASE|$FDRBASE) fatal $(printf "$(gettext "'%s' is the system file and cannot be removed.")" "$FILENAME");;
   esac
   FILENAME=$(keyword $ALINE)
   EXTRASFS="$DIRNAME/$FILENAME"

Code: Select all

title Puppy tahr 6.0.6 12 (sda3/tahr)
  uuid d304ea0b-d87a-415f-93e7-44275ade4a77
  kernel /puppy/tahr/vmlinuz libata.noacpi=1 psubdir=/puppy/tahr pupsfs=Linux pmedia=atahd psave=Work:/pupsaves/ pfix=fsckp,trim,nocopy
  initrd /puppy/tahr/initrd.gz