(old)Puppy Linux Discussion Forum

Code: Select all

--- a/etc/init.d/sfs_load	2014-07-22 11:11:10.000000000 +0300
+++ b/etc/init.d/sfs_load	2015-01-28 11:23:11.000000000 +0200
@@ -1,5 +1,7 @@
 #!/bin/sh
 which sfs_load &>/dev/null || exit 0
+. /etc/rc.d/PUPSTATE 
+[ "$PUPMODE" = "6" ] && exit 0
 if [ "$1" = "stop" ] ; then
   exec sfs_load --cli stop
 fi

Code: Select all

export PATH=$PATH:/usr/local/texlive/2014/bin/i386-linux

Code: Select all

&& [ "$FILEISAT" != "home" ] 

Code: Select all

--- a/usr/sbin/sfs_load	2014-09-06 11:44:34.000000000 +0300
+++ b/usr/sbin/sfs_load	2015-04-08 10:44:48.000000000 +0300
@@ -51,6 +51,8 @@
 #v2.1.9: fix loop device conflict with irregular initramfs
 #2014-08-10 v2.2: fix was removed all sfs after abnormal shutdown
 #2014-09-06 v2.3: fix again save-to-directry, avoid always mounted puppy sfs partition under PUPMODE=5  
+[ "$(grep PUPMODE /etc/rc.d/PUPSTATE | cut -f2 -d '=')" = "6" ] && \
+ rm /mnt/home && ln -sf /initrd/pup_rw /mnt/home 
 MYPATH=$0
 MYNAME=$(basename "$0")
 VERSION=2.3
@@ -188,6 +190,8 @@
   case "$1" in
   --usage) shift
    [ "$@" ] && error "$@"
+   [ "$(grep PUPMODE /etc/rc.d/PUPSTATE | cut -f2 -d '=')" = "6" ] && \
+    rm /mnt/home && ln -sf / /mnt/home
    usage; exit 1;;
   esac 
   error "fatal:$*"
@@ -197,6 +201,8 @@
 }
 finish() {
  splash --stop
+ [ "$(grep PUPMODE /etc/rc.d/PUPSTATE | cut -f2 -d '=')" = "6" ] && \
+  rm /mnt/home && ln -sf / /mnt/home
  [ "$UNMOUNTME" ] && umount "$UNMOUNTME" && UNMOUNTME=""
  [ "$REENT" = "" ] && exit 0
  [ -x "$MYPATH" ] && exec "$MYPATH" $ORGOPT --quiet

Code: Select all

--- a/usr/sbin/sfs_load	2014-09-06 11:44:34.000000000 +0300
+++ b/usr/sbin/sfs_load	2015-04-08 14:36:26.000000000 +0300
@@ -1559,7 +1559,7 @@
   [ "$EXT" = "sfs" ] || FILENAME="$FILENAME.sfs"
   # /mnt/home?
   if [ "$PUP_HOME" != "" -a "$DIRNAME" != "" ]; then
-    DIRNAME=$(echo $DIRNAME| sed -e "s,/initrd$PUP_HOME,/mnt/home,")
+    DIRNAME=$(echo $DIRNAME| sed -e "s,$INITRDHOME,$MNTHOME,")
   fi
   EXTRASFS="$DIRNAME/$FILENAME"
 }
@@ -1831,6 +1831,14 @@
   esac
 fi ############ for debugging end
 
+if [ "$PUPMODE" = "6" ];then
+ INITRDHOME=/
+ MNTHOME=/
+else
+ INITRDHOME=/initrd$PUP_HOME
+ MNTHOME=/mnt/home
+fi
+
 # see what pup_*.sfs file is used
 SFSPART=$(echo $PUPSFS|cut -d',' -f1)
 SFSTYPE=$(echo $PUPSFS|cut -s -d',' -f2)
@@ -1899,8 +1907,8 @@
   12|13) SAVEFILE=$(echo $PUPSAVE| cut -sd',' -f3);;
   *) SAVEFILE="";;
   esac
-  [ "$PUP_HOME" != "" ] && PUPHOME=/initrd$PUP_HOME
-  [ "$PUPHOME" = "/initrd$PUP_HOME" ] && PUPHOME=/mnt/home && DESTDIR=$PUPHOME
+  [ "$PUP_HOME" != "" ] && PUPHOME=$INITRDHOME
+  [ "$PUPHOME" = "$INITRDHOME" ] && PUPHOME=$MNTHOME && DESTDIR=$PUPHOME
 else
   # PUPMODE=2 or 5
   if [ "$PUPMODE" = "2" ]; then
@@ -2326,8 +2334,8 @@
   case "$DIRNAME" in
   http://*|ftp://*) FILEISAT="url" ;;
   /mnt/cdrom*|/mnt/dvd*|/mnt/sr*) FILEISAT="cd";;
-  /mnt/home/$PSUBDIR) FILEISAT="home";;
-  /mnt/home) FILEISAT="home";;
+  $MNTHOME/$PSUBDIR) FILEISAT="home";;
+  $MNTHOME) FILEISAT="home";;
   /tmp*) FILEISAT="tmpfs";;
   $DESTDIR|$DESTDIR/$PSUBDIR) FILEISAT="home";;
   /mnt/network/*) FILEISAT="remote";;
@@ -2410,7 +2418,7 @@
   #TITLEICON='icon-name="gtk-add"'
   confirm "$MSG\n$WARNSHORT" || finish
 fi
-[ "$(readlink /mnt/home)" = "$DESTDIR" ] && DESTDIR=/mnt/home
+[ "$(readlink $MNTHOME)" = "$DESTDIR" ] && DESTDIR=$MNTHOME
 
 # free space in the destination
 dest_free
@@ -2457,7 +2465,7 @@
     done
     if [ "$FOUND" != "" ]; then
       debug "FOUND=$FOUND;"
-      [ "$(readlink /mnt/home)" = "$D" ] && FOUND="/mnt/home/$FILENAME"
+      [ "$(readlink $MNTHOME)" = "$D" ] && FOUND="$MNTHOME/$FILENAME"
       MSG=$(printf "$(gettext "%s is found. Do you use it?")" $FOUND)
       confirm $MSG || finish
       EXTRASFS="$FOUND"

Code: Select all

--- ./sfs_load_2.3	2014-09-06 10:44:34.000000000 +0200
+++ ./sfs_load_2.3.0	2015-07-07 16:06:31.000000000 +0200
@@ -51,9 +51,10 @@
 #v2.1.9: fix loop device conflict with irregular initramfs
 #2014-08-10 v2.2: fix was removed all sfs after abnormal shutdown
 #2014-09-06 v2.3: fix again save-to-directry, avoid always mounted puppy sfs partition under PUPMODE=5  
+#20150706 v2.3.0 by ASRI: Increase the size of main GUI # Add info "number of sfs mounted" # For the list of mounted sfs, use of a "table" (instead of "list") to sort the list alphabetically # Add button refresh
 MYPATH=$0
 MYNAME=$(basename "$0")
-VERSION=2.3
+VERSION=2.3.0
 ORGOPT="$@"
 #some options the puplet builder can choose
 WIPEWHITEONINIT="true"	# true/false
@@ -761,7 +762,18 @@
 }
 main_dialog() {
 	waitsplash $(gettext "Probing...")
-	BOXHEIGHT=150
+	BOXHEIGHT1=300
+	BOXWIDTH=650
+	TEXTWIDTH=580
+	TEXTWIDTHCHARS=30
+		list="/tmp/sfs_load/loop_device_list"
+		cntsfsloaded=0
+		while read LINE
+		do
+			if [ "$LINE" != "" ]; then
+				cntsfsloaded=`expr $cntsfsloaded + 1`
+			fi
+		done < "$list"
 	LOADVISIBLE="enabled"
 	UNLOADVISIBLE="eabled"
 	if [ "$ACTION" = "unload" ]; then
@@ -793,8 +805,9 @@
 	UNLOADCOMBO=""
 	if [ "$ALREADY_SFS_LIST" != "" ]; then
 	  UNLOADABLE="enabled"
-	  UNLOADCOMBO='<list tooltip-text="'$(gettext "Select the sfs file you want to unload.")'">
-	  <variable>UNLOADSFS</variable>'$(make_combo $ALREADY_SFS_LIST)'<visible>'$UNLOADVISIBLE'</visible></list>'
+	  UNLOADCOMBO='<table tooltip-text="'$(gettext "Select the sfs file you want to unload.")'">
+	  <label>'$(gettext 'Total of mounted SFS =')' '$cntsfsloaded'</label>
+	  <variable>UNLOADSFS</variable>'$(make_combo $ALREADY_SFS_LIST)'<visible>'$UNLOADVISIBLE'</visible></table>'
 	  [ "$QUEUELIST" ] && UNLOADCOMBO="$UNLOADCOMBO
 	  "'<text><input>echo -en "'$(gettext "Some are not loaded but in the queue.")'"</input></text>'
 	else
@@ -804,10 +817,10 @@
 	DIALOG='<window title="'$LONG_TITLE'"><vbox>
     <hbox>
     <pixmap><input file>'$MYICON'</input></pixmap>
-	<text width-chars="40"><input>echo -en "'$(gettext "You can load or unload extra SFS files on-the-fly.")'"</input></text>
+	<text width-chars="'$TEXTWIDTHCHARS'" width-request="'$TEXTWIDTH'"><input>echo -en "'$(gettext "You can load or unload extra SFS files on-the-fly.")'"</input></text>
    </hbox>
-	<hbox><frame '$(gettext "Load SFS")'>
-	<vbox height-request="'$BOXHEIGHT'">
+	<hbox width-request="'$BOXWIDTH'"><frame '$(gettext "Load SFS")'>
+	<vbox height-request="'$BOXHEIGHT1'">
    '"$LOADCOMBO
 	$WRONGTEXT"'
 	</vbox>
@@ -816,7 +829,7 @@
 	<action>EXIT:Load</action><visible>'$LOADVISIBLE'</visible></button>
 	</frame>
 	<frame '$(gettext "Unload SFS")'>
-	<vbox height-request="'$BOXHEIGHT'">
+	<vbox height-request="'$BOXHEIGHT1'">
    '$UNLOADCOMBO'
     </vbox>
      <button tooltip-text="'$(gettext "Which SFS do you want to unload?")' '$(gettext "Click here after you choose the extra sfs file.")'">
@@ -825,7 +838,8 @@
 
     </frame></hbox>
     <hbox>
-     <button><label>'$(gettext 'Quit')'</label><input file stock="gtk-quit"></input><action>EXIT:Abort</action></button>
+     <button tooltip-text="'$(gettext "Refresh list of loaded sfs.")'"><input file stock="gtk-refresh"></input><action>sfs_load &</action><action>EXIT:Abort</action></button>
+     <button tooltip-text="'$(eval_gettext "Quit $TITLE v$VERSION.")'"><input file stock="gtk-quit"></input><action>EXIT:Abort</action></button>
     </hbox>
 	</vbox></window>'
 	waitsplash --stop