Check-in [83898ecb35]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:83898ecb35fb1697379e56cb9635005be87d6367
Date: 2013-02-16 00:46:09
User: root
Comment:scripts updated to support f2fs

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/sbin/pup_event_frontend_d

@@ -43,10 +43,11 @@
 #121212 try increase sleep to 3 ...still getting rox-filer crashing.
 #130116 rodin.s: fix one translation, needed LANG set.
 #130128 probepart o/p changed: optical now can be f.s. type 'iso9660', 'udf' (includes video dvds), 'audiocd', or 'none'.
 #130203 change probedisk2 to probedisk.
 #130208 rodin.s: tidy-up some LANG assignments.
+#130216 add support for f2fs.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110513
 
 export TEXTDOMAIN=pup_event_frontend_d
 export OUTPUT_CHARSET=UTF-8
@@ -346,12 +347,12 @@
  #create desktop icon, and directory with handler script, icon and help...
  #requires global variables DRV_NAME, DRV_CATEGORY, DRV_DESCRIPTION.
  #if a passed param $1, then PROBEPART already known, inefficient to rerun here each time.
  DRVINFO="$DRV_NAME"'|0|0'
  if [ "$ICONPARTITIONS" = "true" ];then
-  #display an icon for each partition... w476 add ext4...
-  [ ! $1 ] && PROBEPART="`probepart -k | grep -E '\|ext4\||\|ntfs\||\|msdos\||\|vfat\||\|ext2\||\|ext3\||\|iso9660\||\|udf\||\|audiocd\||\|xfs\||\|reiser'`"
+  #display an icon for each partition... w476 add ext4... 130216 add f2fs...
+  [ ! $1 ] && PROBEPART="`probepart -k | grep -E '\|f2fs\||\|ext4\||\|ntfs\||\|msdos\||\|vfat\||\|ext2\||\|ext3\||\|iso9660\||\|udf\||\|audiocd\||\|xfs\||\|reiser'`"
   drvPATTERN='^/dev/'"${DRV_NAME}" #important, no space on end!
   DRVINFO="`echo "$PROBEPART" | grep "$drvPATTERN" | cut -f 1,2,3 -d '|' | tr '\n' ' '`"
 
   #w482 k2.6.25.16 /proc/partitions (read by probepart) can be slow to update...
   diCNT=0
@@ -358,11 +359,11 @@
   if [ "`echo -n "$DRV_NAME" | grep -E '^sd|^mmc'`" != "" ];then
    while [ "$DRVINFO" = "" ];do
     diCNT=`expr $diCNT + 1`
     [ $diCNT -gt 3 ] && break
     sleep 1
-    PROBEPART="`probepart -k | grep -E '\|ext4\||\|ntfs\||\|msdos\||\|vfat\||\|ext2\||\|ext3\||\|iso9660\||\|udf\||\|audiocd\||\|xfs\||\|reiser'`"
+    PROBEPART="`probepart -k | grep -E '\|f2fs\||\|ext4\||\|ntfs\||\|msdos\||\|vfat\||\|ext2\||\|ext3\||\|iso9660\||\|udf\||\|audiocd\||\|xfs\||\|reiser'`" #130216 added f2fs.
     DRVINFO="`echo "$PROBEPART" | grep "$drvPATTERN" | cut -f 1,2,3 -d '|' | tr '\n' ' '`"
    done
   fi
 
  fi
@@ -645,12 +646,12 @@
  DRV_NAME='drives'
  DRV_CATEGORY='any' #see pmount.
  DRV_DESCRIPTION="all drives"
  create_icon_func #needs DRV_NAME, DRV_CATEGORY, DRV_DESCRIPTION.
 else
- #show all drives on desktop... w476 add ext4...
- PROBEPART="`probepart -k | grep -E '\|ext4\||\|ntfs\||\|msdos\||\|vfat\||\|ext2\||\|ext3\||\|iso9660\||\|udf\||\|audiocd\||\|xfs\||\|reiser'`"
+ #show all drives on desktop... w476 add ext4... 130216 add f2fs...
+ PROBEPART="`probepart -k | grep -E '\|f2fs\||\|ext4\||\|ntfs\||\|msdos\||\|vfat\||\|ext2\||\|ext3\||\|iso9660\||\|udf\||\|audiocd\||\|xfs\||\|reiser'`"
  if [ "$FD0ICON" = "true" ];then #see /etc/eventmanager
   if [ -e /sys/block/fd0 ];then
    PROBEDISK="/dev/fd0|floppy|Legacy floppy drive
 $PROBEDISK"
    PROBEPART="/dev/fd0|vfat|1440

Changes to woof-code/rootfs-skeleton/usr/local/bin/drive_all

@@ -35,10 +35,11 @@
 #120516 pup_event_frontend_d may call here when a drive plugged in, fix handling of automounting.
 #120517 syntax error in 120516, quotes needed.
 #130128 convert i18n "technosaurus-method" to gettext.
 #130128 optical media, if has a f.s., can be either iso9660 or udf (see updated probepart and pup_event_frontend_d).
 #130203 change probedisk2 to probedisk.
+#130216 add support f2fs.
 
 export TEXTDOMAIN=drive_all
 export OUTPUT_CHARSET=UTF-8
 . gettext.sh
 
@@ -336,11 +337,11 @@
 if [ "$FSTYPE" != "" ];then
  DOPARTS="${ONEDRVNAME}|${FSTYPE}" #120517
 else
  #ONEDRVNAME is probably a drive name, ex sda...
  pPTN="/dev/${ONEDRVNAME}" #no space on end!
- DOPARTS="`probepart -m | grep "$pPTN" | cut -f 1,2 -d '|' | cut -f 3 -d '/' | grep -E 'ext2|ext3|ext4|udf|is09660|vfat|reiser|btrfs|ntfs|msdos|minix' | tr '\n' ' '`" #ex: sda1|ext3 sda2|vfat sda3|ext3
+ DOPARTS="`probepart -m | grep "$pPTN" | cut -f 1,2 -d '|' | cut -f 3 -d '/' | grep -E 'f2fs|ext2|ext3|ext4|udf|is09660|vfat|reiser|btrfs|ntfs|msdos|minix' | tr '\n' ' '`" #ex: sda1|ext3 sda2|vfat sda3|ext3  130216 added f2fs
 fi
 
 #if it is a mountable partition then mount and open with rox. If already mntd then open in rox...
 #if [ "$ICONPARTITIONS" = "true" ];then
 EXITFLAG=no

Changes to woof-code/rootfs-skeleton/usr/sbin/Pudd

@@ -12,10 +12,11 @@
 #1102025 use probedisk2.
 #120329 Xdialog bug --yesno supposed to "yes" "No" buttons, but they are "OK" "Cancel".
 #120331 ping -4 for ipv4, refer: http://murga-linux.com/puppy/viewtopic.php?p=616090#616090
 #130203 change probedisk2 to probedisk.
 #130207 BK: this is a very old script, major upgrade. npierce has contributed. fixes not yet tested!
+#130216 support f2fs (may need other upgrades).
 
 BKCOLOR='#ffe0e0'
 BLURBERR=""
 touch /tmp/umounterr.txt
 
@@ -610,11 +611,11 @@
      echo '#!/bin/sh' > /tmp/backuppartition.sh
      if [ "$DESTCHOICE" = "file" ];then
 
       #if source is partition, zeroise unused part for max compression...
       if [ "$SOURCECHOICE" = "partition" ];then
-       ALLOWZERO="`echo "$SOURCEFS" | grep --extended-regexp "ext2|ext3|ext4|Ext2|Ext3|Ext4|FAT12|FAT16|FAT32|msdos|vfat|ReiserFS|reiserfs"`"
+       ALLOWZERO="`echo "$SOURCEFS" | grep --extended-regexp "f2fs|ext2|ext3|ext4|Ext2|Ext3|Ext4|FAT12|FAT16|FAT32|msdos|vfat|ReiserFS|reiserfs"`" #130216 add f2fs.
        if [ ! "$ALLOWZERO" = "" ];then
         Xdialog --wmclass "Pudd" --title "Puppy universal dd: optimise compression" --stdout --ok-label "Yes" --cancel-label "No" --yesno "$SOURCEPART will be copied to $DESTPART.gz, compressed with gzip.
 Compression may be greatly improved if the unused part of $SOURCEPART
 is zeroised. This involves temporarily mounting it on /mnt/tmp,
 writing zeroes to the unused areas, then unmounting it.

Changes to woof-code/rootfs-skeleton/usr/sbin/partview

@@ -1,10 +1,11 @@
 #!/bin/ash
 #Barry Kauler 2012
 #GPL v3 (/usr/share/doc/legal)
 #120202 internationalized. add udf f.s.
 #120723 reduce mmcblk0p1 to mm0p1.
+#130216 support f2fs.
 
 export TEXTDOMAIN=partview
 export OUTPUT_CHARSET=UTF-8
 
 yaf-splash -bg orange -fg black -close never -fontsize large -text "$(gettext 'Please wait, probing drives...')" &
@@ -34,12 +35,12 @@
      style=\"fill:black;stroke:none;font-family:Nimbus Mono L;font-style:normal;font-weight:bold;font-size:26;fill-opacity:1;stroke-opacity:1;stroke-width:3pt;stroke-linejoin:miter;stroke-linecap:butt;text-anchor:start;writing-mode:lr;\"
      x=\"$(($XLEFT2 + $BOXWIDTH + 6))\"
      y=\"18\">$(gettext 'free')
   </text>" >> /tmp/partview_display_svg
 
-
-PARTSLIST="`probepart -k 2> /dev/null | grep '^/dev/' | grep -E 'udf|iso9660|ext2|ext3|ext4|reiserfs|msdos|vfat|ntfs|minix' | cut -f 1-3 -d '|' | tr '\n' ' '`"
+#130216 add f2fs...
+PARTSLIST="`probepart -k 2> /dev/null | grep '^/dev/' | grep -E 'f2fs|udf|iso9660|ext2|ext3|ext4|reiserfs|msdos|vfat|ntfs|minix' | cut -f 1-3 -d '|' | tr '\n' ' '`"
 
 for APART in $PARTSLIST
 do
  MNTSTATUS='(currently mounted)'
  ATAG="`echo -n "$APART" | cut -f 1 -d '|' | cut -f 3 -d '/'`"

Changes to woof-code/rootfs-skeleton/usr/sbin/pmount

@@ -35,10 +35,11 @@
 #120203 preferences was broken.
 #120129 karl godt: fix ZOMBIES, see http://murga-linux.com/puppy/viewtopic.php?t=71767&start=420. see also rc.shutdown, drive_all, pup_event_frontend_d.
 #120323 partial replace 'gxmessage' with 'pupmessage'.
 #130128 convert "technosaurus method" i18n to gettext. mut2 option removed (very old, no longer works properly).
 #130128 fixed for 'udf' f.s. (see also pup_event_frontend_d, drive_all, probepart).
+#130216 support f2fs.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
 
 export TEXTDOMAIN=pupmount #so as not to clash with 'pmount.mo' used by previous i18n method.
 export OUTPUT_CHARSET=UTF-8
@@ -129,12 +130,12 @@
 #old probedisk has: cdrom, disk, floppy, Direct-Access.
 #probedisk2 has: drive, optical, usbdrv, card, floppy
 TABLIST="`echo -n "$DISKINFO" | cut -f 2 -d '|' | uniq | tr '\n' '|' | sed -e 's/|$//'`"
 CURRENTTAB=''
 
-#v408 v410 moved up...
-VALIDPARTS="`echo "$PARTSINFO" | grep -E 'vfat|msdos|ntfs|minix|ext2|ext3|ext4|reiser|xfs|iso9660|udf'`" #130128
+#v408 v410 moved up...  130216 added f2fs...
+VALIDPARTS="`echo "$PARTSINFO" | grep -E 'f2fs|vfat|msdos|ntfs|minix|ext2|ext3|ext4|reiser|xfs|iso9660|udf'`" #130128
 
 #get actual top tab...
 TOPACTUAL="`echo "$TABLIST" | cut -f 1 -d '|'`"
 
 #v4.01 PARTSINFO has to be sorted in same order as the categories in DISKINFO...

Changes to woof-code/rootfs-skeleton/usr/sbin/puppyinstaller

@@ -49,10 +49,11 @@
 #120329 Xdialog bug --yesno supposed to "yes" "No" buttons, but they are "OK" "Cancel".
 #120823 rerwin: preserve user-modified files in full-install upgrade.
 #121116 LANG extraction was broken.
 #130128 handle 'udf' f.s. (see also pmount, pup_event_frontend_d, drive_all, probepart).
 #130203 change probedisk2 to probedisk.
+#130216 partial support f2fs.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
 
 export TEXTDOMAIN=puppyinstaller
 export OUTPUT_CHARSET=UTF-8
@@ -1233,11 +1234,11 @@
 
   #INSTOPTION, install puppy to DESTPART...
   if [ "$INSTOPTION" = "1" ];then #frugal.
 
    case $DESTFS in #100719
-    ext2|ext3|ext4|reiserfs|minix|btrfs)
+    ext2|ext3|ext4|reiserfs|minix|btrfs|f2fs) #130216 add f2fs.
      Xdialog --stdout --wmclass "gtkdialog2" --left --title "$(gettext 'Puppy Universal Installer')" --msgbox "$(gettext 'You have chosen a frugal installation. As you are installing Puppy to a')
 `eval_gettext \"partition with a Linux filesystem (\\\${DESTFS}), the first time that you run\"`
 $(gettext 'Puppy and shutdown you will be offered to save the session to either a single')
 $(gettext 'file or to the entire partition.')
 

Changes to woof-code/rootfs-skeleton/usr/sbin/remasterpup2

@@ -45,10 +45,11 @@
 #120607 rerwin: Remove indicators/files for integrated user-installed packages.
 #120628 shinobar: no change id-string for reuse
 #120721 revert 'wildcards' option (from 120605); improve /dev/snd file exclusion; exclude /usr/share/icons/hicolor/icon-theme.cache (shinobar).
 #121021 rerwin: revert 120605 modem daemon removals (because daemons no longer copied from firmware directory).
 #130203 change probedisk2 to probedisk.
+#130216 partial support f2fs.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
 
 Yes_lbl="Yes"
 No_lbl="No"
@@ -336,12 +337,12 @@
 SIZENEEDEDM=`expr $SIZETOTALM \/ 3`
 SIZESLACKM=`expr $SIZENEEDEDM \/ 3` #guess
 SIZENEEDEDM=`expr $SIZENEEDEDM + $SIZESLACKM`
 SIZENEEDEDM=`expr $SIZENEEDEDM + 25` #space for vmlinuz, initrd.gz, zdrv, etc
 #echo "SIZENEEDEDM=$SIZENEEDEDM"
-#now choose working partition... v431 add ext4...
-PARTSLIST="`probepart -m 2> /dev/null | grep '^/dev/' | grep -E 'ext2|ext3|ext4|reiserfs|msdos|vfat|ntfs' | cut -f 1-3 -d '|'`"
+#now choose working partition... v431 add ext4...  130216 add f2fs...
+PARTSLIST="`probepart -m 2> /dev/null | grep '^/dev/' | grep -E 'f2fs|ext2|ext3|ext4|reiserfs|msdos|vfat|ntfs' | cut -f 1-3 -d '|'`"
 
  echo -n "" > /tmp/schoices.txt
  echo "$PARTSLIST" |
  while read APART
  do

Changes to woof-code/rootfs-skeleton/usr/sbin/shutdownconfig

@@ -23,10 +23,11 @@
 #120427 01micko: support ext4 in save-file. 120428
 #120512 Karl Godt: some parameters missing from lines 626, 630, 642.
 #120514 Karl Godt: precaution, save-file must be bigger than size used in ram.
 #120823 rerwin: avoid saving personal data if flag set in /etc (by remasterpup2, file /etc/personal_data_save_disabled).
 #130128 support udf f.s. (see also sfsget, puppyinstaller, pmount, pup_event_frontend_d, drive_all, probepart).
+#130216 support f2fs.
 
 if [ ! $DISPLAY ];then
  export LANG=C #110928 console shutdown using 'dialog', disable i18n.
 else
  export OUTPUT_CHARSET=UTF-8
@@ -139,11 +140,12 @@
   T_yesno="\Z1${T_yesno1}\Zn\n\n\Z5${T_yesno2}\Zn\n\n${T_yesno3}" #111003
   ${DIALOGEXE} ${BACKGROUNDYELLOW} ${TITLEPARAM} "$T_fidotitle" --colors --yes-label "$T_continue" --no-label "$T_abort" --yesno "$T_yesno" 0 0 >/dev/console
   [ ! $? -eq 0 ] && return 1 #abort.
  fi
 
- PARTSLIST="`probepart -m 2> /dev/null | grep '^/dev/' | grep "$expBOOTDRV" | grep -E 'ext2|ext3|ext4|reiserfs|msdos|vfat|minix|ntfs|btrfs' | cut -f 1-3 -d '|' | sed -e 's/msdos/vfat/g'`"
+ #130216 add f2fs...
+ PARTSLIST="`probepart -m 2> /dev/null | grep '^/dev/' | grep "$expBOOTDRV" | grep -E 'f2fs|ext2|ext3|ext4|reiserfs|msdos|vfat|minix|ntfs|btrfs' | cut -f 1-3 -d '|' | sed -e 's/msdos/vfat/g'`"
 
  #offer floppy disk if present...
  if [ "`cat /var/log/messages | grep "Floppy drive" | grep "fd0"`" != "" ];then
   if [ "`disktype /dev/fd0 | grep 'file system' | grep '^FAT'`" != "" ];then
    if [ "$PARTSLIST" = "" ];then
@@ -578,11 +580,11 @@
 T_orwait240="$(gettext 'Or, wait 240 seconds to shutdown without saving session...')"
 T_save="$(gettext 'SAVE')"
 T_cd="$(gettext 'SAVE TO CD')"
 
 case $xDEVFS in
- ext2|ext3|ext4|reiserfs|minix|btrfs) #linux f.s.
+ ext2|ext3|ext4|reiserfs|minix|btrfs|f2fs) #linux f.s.  130216 add f2fs.
   #do not allow save to entire partition if pup installed in a subdirectory...
   xPSUBDIR="`echo -n "$PUPSFS" | cut -f 3 -d ',' | sed -e 's%/[^/]*$%%'`" #ex: sda3,ext2,/pup220/puppy.sfs will return /pup220
   SAVECHOICE=1
 
   if [ "$xPSUBDIR" = "" ];then

Changes to woof-distro/arm/Packages-puppy-armv6-official

@@ -76,11 +76,11 @@
 gpptp-0.2-armv6|gpptp|0.2-armv6||Network|40K||gpptp-0.2-armv6.pet|+pptp,+gtk+|PPTP VPN client gui, modified by jafadmin (see puppy forum)|puppy|||
 gtkdialog3-0.7.20-patched_pe1_arm-sap6|gtkdialog3|0.7.20-patched_pe1_arm-sap6||BuildingBlock|164K||gtkdialog3-0.7.20-patched_pe1_arm-sap6.pet|+gtk+|gui for shell scripts, older version, may be installed alongside gtkdialog4|debian|squeeze||
 gtkdialog3_DOC-0.7.20-patched_pe1_arm-sap6|gtkdialog3_DOC|0.7.20-patched_pe1_arm-sap6||BuildingBlock|164K||gtkdialog3_DOC-0.7.20-patched_pe1_arm-sap6.pet|+gtk+|gui for shell scripts, older version, may be installed alongside gtkdialog4||||
 gtkdialog4-0.8.0-patched_arm-sap6|gtkdialog4|0.8.0-patched_arm-sap6||BuildingBlock|196K||gtkdialog4-0.8.0-patched_arm-sap6.pet|+gtk+|gui for shell scripts|debian|squeeze||
 gtkdialog4_DOC-0.8.0-patched_arm-sap6|gtkdialog4_DOC|0.8.0-patched_arm-sap6||BuildingBlock|648K||gtkdialog4_DOC-0.8.0-patched_arm-sap6.pet||gui for shell scripts||||
-guess_fs-20120911-armv6|guess_fs|20120911-armv6||BuildingBlock|40K||guess_fs-20120911-armv6.pet||determine filesystem of a partition|debian|squeeze||
+guess_fs-20130215-static-armv6|guess_fs|20130215-static-armv6||BuildingBlock|40K||guess_fs-20130215-static-armv6.pet||determine filesystem of a partition||||
 gwhere-0.2.3-patched_4-armv6|gwhere|0.2.3-patched_4-armv6||Filesystem|688K||gwhere-0.2.3-patched_4-armv6.pet|+gtk+|disk cataloger|puppy|||
 gwhere_DEV-0.2.3-patched_4-armv6|gwhere_DEV|0.2.3-patched_4-armv6||Filesystem|3036K||gwhere_DEV-0.2.3-patched_4-armv6.pet|+gwhere|disk cataloger|puppy|||
 gwhere_DOC-0.2.3-patched_4-armv6|gwhere_DOC|0.2.3-patched_4-armv6||Filesystem|20K||gwhere_DOC-0.2.3-patched_4-armv6.pet||disk cataloger||||
 gwhere_NLS-0.2.3-patched_4-armv6|gwhere_NLS|0.2.3-patched_4-armv6||Filesystem|656K||gwhere_NLS-0.2.3-patched_4-armv6.pet|+gwhere|disk cataloger||||
 gxmessage-2.12.4-armv6|gxmessage|2.12.4-armv6||BuildingBlock|64K||gxmessage-2.12.4-armv6.pet|+gtk+|simple gui for shell scripts|puppy|||