Check-in [52c69e3b0e]
Not logged in

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

Overview

SHA1 Hash:52c69e3b0e7cdfbcfe2bde886feba56481b5bfb7
Date: 2012-04-26 23:38:08
User: BarryK
Comment:01micko: support ext4 in save-file

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/etc/rc.d/rc.shutdown

@@ -63,10 +63,11 @@
 #120129 karl godt: improved ZOMBIES, see http://www.murga-linux.com/puppy/viewtopic.php?t=73122
 #120130 rodin.s: update for gettext (line 91).
 #120218 changed TEXTDOMAIN=etcrcd___rc.shutdown to TEXTDOMAIN=rc.shutdown (unlikely to be any other file same name in $PATH).
 #120219 zekebaby: unmount network shares, alternate method. 120220 another alternate method.
 #120409 experimenting with minit, i discovered "rm -rf /tmp/*" is killing mingetty. initrd.gz wipes it, have added code to wipe for full hd install at bootup...
+#120427 01micko: support ext4 save-file.
 
 #110923
 . /usr/bin/gettext.sh # enables use of eval_gettext (several named variables) and ngettext (plurals)
 export TEXTDOMAIN=rc.shutdown
 export OUTPUT_CHARSET=UTF-8
@@ -391,11 +392,12 @@
   #echo "Saving session to $SAVEFILE file on $SAVEPART partition..." >/dev/console
   mkdir /tmp/save1stpup
   #echo -n $(gettext "Mounting ${SAVEFILE}...")
   echo -n "Mounting ${SAVEFILE}..."
   FILEFS="ext3"
-  [ ! "`echo -n "$SAVEFILE" | grep "2fs"`" = "" ] && FILEFS="ext2"
+  [ "`echo -n "$SAVEFILE" | grep "2fs"`" != "" ] && FILEFS="ext2"
+  [ "`echo -n "$SAVEFILE" | grep "4fs"`" != "" ] && FILEFS="ext4" #120427 01micko
 
   if [ "$CRYPTO" = "" ];then
    mount -t $FILEFS -o noatime,rw,loop $SMNTPT$SAVEFILE /tmp/save1stpup
   else
    #note: loop2 is kept available for scripts to use. but, do this to find free one...

Changes to woof-code/rootfs-skeleton/etc/rc.d/rc.sysinit

@@ -755,11 +755,11 @@
 [ "$DVDTYPE" ] && ln -sf /dev/$DVDTYPE /dev/dvd
 [ "$CDBURNERTYPE" ] && echo -n "$CDBURNERTYPE" > /etc/cdburnerdevice
 [ "$DVDTYPE" ] && hdparm -d1 /dev/$DVDTYPE >/dev/null 2>&1
 
 echo -n ' input' >/dev/console #100131
-if [ ! -f /etc/mousedevice ];then
+if [ ! -s /etc/mousedevice ];then #120423 change -f to -s test.
  echo -n "input/mice" > /etc/mousedevice
  ln -snf input/mice /dev/mouse
 else
  [ "`cat /etc/mousedevice`" = "psaux" ] && echo -n "input/mice" > /etc/mousedevice
 fi

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

@@ -18,10 +18,11 @@
 #111015 typo.
 #111110 need to export CRYPTO in /tmp/shutdownconfig_results, for rc.shutdown.
 #120323 replace 'xmessage' with 'pupmessage'.
 #120327 only show "*RECOMMENDED*" partition for savefile if >256MB free.
 #120327 expBOOTDRV needs to be exported to rc.shutdown.
+#120427 01micko: support ext4 in save-file.
 
 if [ ! $DISPLAY ];then
  export LANG=C #110928 console shutdown using 'dialog', disable i18n.
 else
  export OUTPUT_CHARSET=UTF-8
@@ -324,11 +325,21 @@
  #dialog --no-cancel --title "Choose filesystem of save-file" --menu "Previously, Puppy has only used 'ext2', now there is a choice. Regarding power-failure, note that Puppy will do a f.s. check at next boot so ext2 can recover, however journalled filesystems can recover even without a f.s. check. If in doubt, just press ENTER to choose 'ext2', otherwise TAB down then ENTER..." 0 0 0 ext2 "Maximum storage space, encrypted save-file must use ext2" ext3 "Journalled f.s., safest if power failure etc." ext4 "Journalled f.s., safest if power failure etc."  >/dev/console 2>/tmp/rc.shutdown_pupsave_fs
  T_fstitle="$(gettext 'First shutdown: choose filesystem')"
  T_fsmenu="$(gettext 'Previously, Puppy has only used 'ext2', now there is a choice. Regarding power-failure, note that Puppy will do a f.s. check at next boot so ext2 can recover, however journalled filesystems can recover even without a f.s. check. If in doubt, choose 'ext2'. After making the choice, click OK button...')"
  T_ext2="$(gettext 'Maximum storage space, encrypted save-file must use ext2')"
  T_ext3="$(gettext 'Journalled f.s., safest if power failure etc.')"
- ${DIALOGEXE} ${BACKGROUNDYELLOW} ${TITLEPARAM} "$T_fstitle"  --no-cancel --menu "$T_fsmenu" 0 0 3 ext2 "$T_ext2" ext3 "$T_ext3"  >/dev/console 2>/tmp/rc.shutdown_pupsave_fs #110926
+ #120427 01micko: support ext4...
+ T_ext4="$(gettext 'Journalled f.s., safest if power failure etc.')"
+ KVER=`uname -r`
+ HAVEEXT4='no'
+ [ -f /lib/modules/${KVER}/modules.builtin ] && [ "`grep 'fs/ext4`" != "" ] && HAVEEXT4='yes'
+ [ "$HAVEEXT4" = "no" ] && [ "`modinfo ext4 2>/dev/null`" != "" ] && HAVEEXT4='yes'
+ if [ "$HAVEEXT4" = "yes" ];then
+  ${DIALOGEXE} ${BACKGROUNDYELLOW} ${TITLEPARAM} "$T_fstitle"  --no-cancel --menu "$T_fsmenu" 0 0 3 ext2 "$T_ext2" ext3 "$T_ext3"  ext4 "$T_ext4" >/dev/console 2>/tmp/rc.shutdown_pupsave_fs #120425 01micko
+ else
+  ${DIALOGEXE} ${BACKGROUNDYELLOW} ${TITLEPARAM} "$T_fstitle"  --no-cancel --menu "$T_fsmenu" 0 0 3 ext2 "$T_ext2" ext3 "$T_ext3"  >/dev/console 2>/tmp/rc.shutdown_pupsave_fs #110926
+ fi
  SFFS="`cat /tmp/rc.shutdown_pupsave_fs`"
  [ "$SFFS" = "" ] && SFFS='ext2'
  SFEXTNUM="`echo -n "$SFFS" | cut -c 4`"
  SFEXT="${SFEXTNUM}fs" #ex: 2fs
  sfPATTERN="s%[234]fs$%${SFEXTNUM}fs%"

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

@@ -1,1 +1,13 @@
-
+busybox-1.19.3-static-armv6l|busybox|1.19.3-static-armv6l||BuildingBlock|980K||busybox-1.19.3-static-armv6l.pet||small system utilities, configured with suid_config, compiled statically with rob langley uclibc armv6l toolachain||||
+disktype-9-patched_pardus_bk-static-armv6|disktype|9-patched_pardus_bk-static-armv6||BuildingBlock|100K||disktype-9-patched_pardus_bk-static-armv6.pet||get information about a partition, compiled statically for armv6||||
+elspci-0.0.6-static-armv6|elspci|0.0.6-static-armv6||BuildingBlock|64K||elspci-0.0.6-static-armv6.pet||determine filesystem of a partition, compiled statically for armv6||||
+embutils_cut-0.19-static-armv6|embutils_cut|0.19-static-armv6||BuildingBlock|16K||embutils_cut-0.19-static-armv6.pet||small static utilities, cut-down selection of full pkg, armv6||||
+guess_fs-20090512-static-armv6|guess_fs|20090512-static-armv6||BuildingBlock|52K||guess_fs-20090512-static-armv6.pet||determine filesystem of a partition||||
+hotplug2stdout-1.2.1-no_cddetect-static-armv6|hotplug2stdout|1.2.1-no_cddetect-static-armv6||BuildingBlock|96K||hotplug2stdout-1.2.1-no_cddetect-static-armv6.pet||monitor kernel uevents, note source has cddetect_quick but was unable to cross-compile for arm so left out||||
+linux_headers-2.6.35.14|linux_headers|2.6.35.14||BuildingBlock|4264K||linux_headers-2.6.35.14.pet||linux header files||||
+linux_kernel-2.6.35.14-armv6-raspi|linux_kernel|2.6.35.14-armv6-raspi||BuildingBlock|10840K||linux_kernel-2.6.35.14-armv6-raspi.pet||kernel compiled for RaspberryPi armv6 board, with loglevel, usb, unionfs, and raspi patches, compiled with gcc 4.5.1|debian|squeeze||
+rox_filer-20111022-patched2-armv6|rox_filer|20111022-patched2-armv6||Filesystem|1464K||rox_filer-20111022-patched2-armv6.pet|+gtk+|ROX-Filer file manager, note compiled in Lucid Ubuntu armel with mcpu=1176jzf-s so should work all armv6 and armv7||||
+squashfs-tools4-4.2-no_xz_lzo-armv6|squashfs-tools4|4.2-no_xz_lzo-armv6||BuildingBlock|204K||squashfs-tools4-4.2-no_xz_lzo-armv6.pet||utilities to create and extract to/from squashfs 4.2 filesystem. note, this was compiled with gzip compression only||||
+tar-1.26-armv6|tar|1.26-armv6||BuildingBlock|400K||tar-1.26-armv6.pet||archive utility||||
+udev_167-167-static-armv6|udev_167|167-static-armv6||BuildingBlock|420K||udev_167-167-static-armv6.pet||daemon to handle kernel uevents. static, but also have libudev as some apps need it||||
+unionfs_utils-0.2.1-armv6|unionfs_utils|0.2.1-armv6||BuildingBlock|64K||unionfs_utils-0.2.1-armv6.pet||utilities for unionfs layered filesystem||||

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

@@ -1,1 +1,2 @@
-
+jwm2-574-armv7|jwm2|574-armv7||Desktop|224K||jwm2-574-armv7.pet||joes window manager and tray, compiled in lucid ubuntu armel||||
+linux_kernel-2.6.36-mele-armv7-a10|linux_kernel|2.6.36-mele-armv7-a10||BuildingBlock|47700K||linux_kernel-2.6.36-mele-armv7-a10.pet||kernel compiled for Mele A1000 internet set-top-box with Alwinner A10 CPU chip||||

Changes to woof-distro/arm/debian/squeeze/DISTRO_COMPAT_REPOS-debian-squeeze


Changes to woof-distro/arm/debian/squeeze/DISTRO_PET_REPOS


Changes to woof-distro/arm/debian/squeeze/DISTRO_PKGS_SPECS-debian-squeeze


Changes to woof-distro/arm/debian/squeeze/DISTRO_SPECS


Changes to woof-distro/arm/debian/squeeze/Packages-puppy-squeeze-official

@@ -1,14 +1,1 @@
 0hack1_dev-2-woof|0hack1_dev|2-woof||BuildingBlock|164K||0hack1_dev-2-woof.pet||hack for debian|debian|squeeze||
-busybox-1.19.3-static-armv6l|busybox|1.19.3-static-armv6l||BuildingBlock|980K||busybox-1.19.3-static-armv6l.pet||small system utilities, configured with suid_config, compiled statically with rob langley uclibc armv6l toolachain||||
-disktype-9-patched_pardus_bk-static-armv6|disktype|9-patched_pardus_bk-static-armv6||BuildingBlock|100K||disktype-9-patched_pardus_bk-static-armv6.pet||get information about a partition, compiled statically for armv6||||
-elspci-0.0.6-static-armv6|elspci|0.0.6-static-armv6||BuildingBlock|64K||elspci-0.0.6-static-armv6.pet||determine filesystem of a partition, compiled statically for armv6||||
-embutils_cut-0.19-static-armv6|embutils_cut|0.19-static-armv6||BuildingBlock|16K||embutils_cut-0.19-static-armv6.pet||small static utilities, cut-down selection of full pkg, armv6||||
-guess_fs-20090512-static-armv6|guess_fs|20090512-static-armv6||BuildingBlock|52K||guess_fs-20090512-static-armv6.pet||determine filesystem of a partition||||
-hotplug2stdout-1.2.1-no_cddetect-static-armv6|hotplug2stdout|1.2.1-no_cddetect-static-armv6||BuildingBlock|96K||hotplug2stdout-1.2.1-no_cddetect-static-armv6.pet||monitor kernel uevents, note source has cddetect_quick but was unable to cross-compile for arm so left out||||
-linux_headers-2.6.35.14|linux_headers|2.6.35.14||BuildingBlock|4264K||linux_headers-2.6.35.14.pet||linux header files||||
-linux_kernel-2.6.35.14-armv6-raspi|linux_kernel|2.6.35.14-armv6-raspi||BuildingBlock|10840K||linux_kernel-2.6.35.14-armv6-raspi.pet||kernel compiled for RaspberryPi armv6 board, with loglevel, usb, unionfs, and raspi patches, compiled with gcc 4.5.1|debian|squeeze||
-linux_kernel-2.6.36-mele-armv7-a10|linux_kernel|2.6.36-mele-armv7-a10||BuildingBlock|47700K||linux_kernel-2.6.36-mele-armv7-a10.pet||kernel compiled for Mele A1000 internet set-top-box with Alwinner A10 CPU chip||||
-squashfs-tools4-4.2-no_xz_lzo-armv6|squashfs-tools4|4.2-no_xz_lzo-armv6||BuildingBlock|204K||squashfs-tools4-4.2-no_xz_lzo-armv6.pet||utilities to create and extract to/from squashfs 4.2 filesystem. note, this was compiled with gzip compression only||||
-tar-1.26-armv6|tar|1.26-armv6||BuildingBlock|400K||tar-1.26-armv6.pet||archive utility||||
-udev_167-167-static-armv6|udev_167|167-static-armv6||BuildingBlock|420K||udev_167-167-static-armv6.pet||daemon to handle kernel uevents. static, but also have libudev as some apps need it||||
-unionfs_utils-0.2.1-armv6|unionfs_utils|0.2.1-armv6||BuildingBlock|64K||unionfs_utils-0.2.1-armv6.pet||utilities for unionfs layered filesystem||||

Deleted woof-distro/arm1176jzf-s/debian/squeeze/DISTRO_COMPAT_REPOS-debian-squeeze

Deleted woof-distro/arm1176jzf-s/debian/squeeze/DISTRO_PET_REPOS

Deleted woof-distro/arm1176jzf-s/debian/squeeze/DISTRO_PKGS_SPECS-debian-squeeze

Deleted woof-distro/arm1176jzf-s/debian/squeeze/DISTRO_SPECS

Deleted woof-distro/arm1176jzf-s/debian/squeeze/Packages-puppy-squeeze-official