(old)Puppy Linux Discussion Forum

Code: Select all

#120103 karl godt: error unmounting stray partitions. 120103 karl godt: more tweaks.

Code: Select all

# v2.2   8apr12: fix was failed with no space partition(tnx to Ghost Dog), fix was failed with SAVEMARK, fix was failed mmc card, default partition and folder, exit 0 (thanks to don)
# v2.2  10apr12: sync with woof 20409, kill acpid (rc.shutdown)

Code: Select all

# diff -up /initrd/pup_ro2/usr/bin/pupsaveconfig /usr/bin/pupsaveconfig
--- /initrd/pup_ro2/usr/bin/pupsaveconfig	2012-04-14 00:52:29.000000000 +0100
+++ /usr/bin/pupsaveconfig	2012-04-15 22:46:58.277478425 +0100
@@ -1496,7 +1496,13 @@ $BUTTONS
    determinsize || continue	# v2.2
   [ "$MSG" = "$MSG0" ] && MSG=$MSG1
   SIZELIST="$MSIZE@MB"
-  for ACHOICE in 64 128 256 512 768 1024 1536 2048	# v2.2: 32MB in choice
+  DU_INITRD_PUP_RW=`du -B 1M -c /initrd/pup_rw |tail -n1 |awk '{print $1}'` #du 1M=1024,1MB=1000
+  VALUES='32 64 128 256 512 768 1024 1280 2048 4096'
+  for val in $VALUES;do
+  [ "$val" -gt "$DU_INITRD_PUP_RW" ] && VALIDS="$VALIDS $val"
+  done 
+  #for ACHOICE in 64 128 256 512 768 1024 1536 2048	# v2.2: 32MB in choice
+  for ACHOICE in $VALIDS
   do
     SIZE=$ACHOICE
     [ $SIZE -gt $MFREE ] && SIZE=$MFREE

Code: Select all

# diff -up /initrd/pup_ro2/usr/sbin/shutdownconfig /usr/sbin/shutdownconfig
--- /initrd/pup_ro2/usr/sbin/shutdownconfig	2011-11-10 05:11:50.000000000 +0100
+++ /usr/sbin/shutdownconfig	2012-04-15 22:37:10.343996867 +0100
@@ -63,6 +63,8 @@ else
  BACKGROUNDORANGE=''
 fi
 
+DU_INITRD_PUP_RW=`du -B 1M -c /initrd/pup_rw |tail -n1 |awk '{print $1}'` #M=1024,MB=1000
+
 choosepartfunc() { 
  #dialog to choose what partition to create ${DISTRO_FILE_PREFIX}save.2fs on...
  T_admin="$(gettext 'administrator')"
@@ -274,11 +276,15 @@ Or, \Zb\\\${T_abort}\ZB to shutdown with
 } #end choosepartfunc
 
 choosesizefunc(){
- local KFREE SIZELIST NUM CHOICES FLABEL SLABEL ACHOICE KSIZE
+ local KFREE SIZELIST NUM CHOICES FLABEL SLABEL ACHOICE KSIZE VALUES VALIDS val
  KFREE=$1 ; SIZELIST="" ; NUM=1 ; CHOICES=""
  FLABEL="`expr $KFREE \/ 1024`MB"
  [ $KFREE -ge 1048576 ] && FLABEL="`dc $KFREE 1048576 \/ p`GB"
- for ACHOICE in 32 64 128 256 512 768 1024 1280 2048 4096
+ VALUES='32 64 128 256 512 768 1024 1280 2048 4096'
+ for val in $VALUES;do
+ [ "$val" -gt "$DU_INITRD_PUP_RW" ] && VALIDS="$VALIDS $val"
+ done 
+ for ACHOICE in $VALIDS
  do
   KSIZE=`expr $ACHOICE \* 1024`
   SLABEL="${ACHOICE}MB"
@@ -297,6 +303,7 @@ choosesizefunc(){
  T_sizetitle="$(gettext 'First shutdown: size save-file')"
  T_sitemenu="$(gettext 'Please choose the size you would like for the personal save file.
 Note, 512M is a good choice, or highest if that not available.
+Note, ${DU_INITRD_PUP_RW}M have accumulated in this session .
 Select choice, then click OK button...')"
  ${DIALOGEXE} ${BACKGROUNDYELLOW} ${TITLEPARAM} "$T_sizetitle" --no-collapse --no-cancel --default-item "5" --menu "$T_sitemenu" 0 0 0 $SIZELIST >/dev/console 2>/tmp/sizetag.txt
  NUM=`cat /tmp/sizetag.txt`

Code: Select all

# adjustables
EXT4SUPPORT="yes"   # EXT4SUPPORT="" to disable ext4 support ("yes" to support if available)
HIDEADVANCED=""   # 'yes' to hide advanced file options, ''(null) to show all options
WAIT1=120 # in second, time limit before shutdown
MINMB=64      # smallest savefile size in MB, to show smaller than 64
STDMB=512   # standard savefile size
MAXMB=2048   # largest savefile size in choice, to show larger than 2048