Check-in [6dccd3e818]
Not logged in

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

Overview

SHA1 Hash:6dccd3e818fb065abd4a68285d1e6f675366fef2
Date: 2012-07-16 11:20:10
User: BarryK
Comment:full-install f.s. check from ramdisk at bootup, fixed, scripts initNEW and rc.sysinit

Tags And Properties
Changes

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

@@ -76,10 +76,11 @@
 #120503 if kernel mounts a f.s. on /dev, removes my skeleton /dev
 #120505 remove network reconnect flag if it exists.
 #120704 introduce /etc/rc.d/BOOTCONSTRAINED. written by 3builddistro.
 #120706 removed some sync's, think they are bad idea in this script.
 #120709 BOOT_UDEVDCHILDREN from /etc/rc.d/BOOTCONSTRAINED
+#120716 log size of ram, read by /sbin/initNEW for f.s. check.
 
 #unset TZ #100319 busybox hwclock gives priority to this (rather than /etc/localtime) and 'init' has set it wrong.
 #...comment-out for now. note, TZ now set in rc.country.
 ORIGLANG="`grep '^LANG=' /etc/profile | cut -f 2 -d '=' | cut -f 1 -d ' '`" #120217
 ORIGLANG1="${ORIGLANG%_*}" #ex: en
@@ -195,10 +196,13 @@
 ##v2.20 some apps need shm (shared memory) (ex: xfdiff)... 100319 do this always...
 FREERAM=`free | grep -o 'Mem: .*' | tr -s ' ' | cut -f 4 -d ' '` #w481 110405
 QTRFREERAM=`expr $FREERAM \/ 4`
 mkdir -p /dev/shm #120503 if kernel mounts a f.s. on /dev, removes my skeleton /dev
 mount -t tmpfs -o size=${QTRFREERAM}k shmfs /dev/shm ;STATUS=$((STATUS+$?))
+
+#120716 /sbin/init needs to know ramdisk size, before /sys mounted...
+[ ! -f /var/local/ram_size_bytes ] && [ -e /sys/block/ram0/size ] && cat /sys/block/ram0/size > /var/local/ram_size_bytes
 
 #w478 moved this code above call to rc.update...
 KERNVER="`uname -r`"
 #KERNMAJ=`echo -n "$KERNVER" | cut -f 3 -d '.' | cut -f 1 -d '-' | cut -f 1 -d '_'` #v431 100831. 120124 remove.
 #w469 may need to run 'depmod'...

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

@@ -7,25 +7,32 @@
 #this script is /sbin/init in the main Puppy f.s., which is the very first to run.
 #in the case of not a full hd install, this script just passes execution to busybox init.
 #100911 fsckme.err filename changed to fsckme.flg. see also init (initramfs), rc.sysinit, rc.shutdown.
 #101020 no longer have /etc/modprobe.conf.
 #120408 support minit
-#120516 gentoo, libgcc_s.so.1 in wrong place.
+#120516 gentoo: libgcc_s.so.1 in wrong place.
 #120627 check ramdisk big enough.
+#120716 revert 120627, /sys not yet loaded. do it a different way. fix for weird 'tr' missing.
+#120716 raspi: no battery-backed hardware clock, so date is wrong, workaround. fixes for rc.sysinit in ramdisk.
 
 INITEXE='/bin/busybox init'
 [ -f /sbin/minit ] && INITEXE='/sbin/minit'
 
 [ -d /initrd ] && exec ${INITEXE} #not a full hd install.
 [ ! -e /fsckme.flg ] && exec ${INITEXE} #no error.
 
-#120627
-if [ ! -e /sys/block/ram0/size ];then
- rm -f /fsckme.flg
- exec ${INITEXE} #unable to do f.s. check.
-fi
-if [ `cat /sys/block/ram0/size` -lt 32768 ];then
+#120627 120716
+#if [ ! -e /sys/block/ram0/size ];then
+# rm -f /fsckme.flg
+# exec ${INITEXE} #unable to do f.s. check.
+#fi
+#if [ `cat /sys/block/ram0/size` -lt 32768 ];then
+# rm -f /fsckme.flg
+# exec ${INITEXE} #unable to do f.s. check.
+#fi
+[ ! -f /var/local/ram_size_bytes ] && exec ${INITEXE} #created in rc.sysinit
+if [ `cat /var/local/ram_size_bytes` -lt 20000 ];then #was 32768
  rm -f /fsckme.flg
  exec ${INITEXE} #unable to do f.s. check.
 fi
 
 PATH='/bin:/sbin'
@@ -98,16 +105,38 @@
   LOCALTIME="/usr/share`readlink /etc/localtime | sed 's%^.*/zoneinfo%/zoneinfo%'`"
   LOCALTDIR="`dirname $LOCALTIME`"
   mkdir -p /mnt/ram0/$LOCALTDIR
   cp -a $LOCALTIME /mnt/ram0/$LOCALTDIR/
   mkdir /mnt/ram0/etc/rc.d
+  #120716 raspi: no battery-backed hardware clock, so date is wrong...
+  mkdir -p /mnt/ram0/var/local/
+  [ -f /var/local/shutdown_date_saved ] && cp -a -f /var/local/shutdown_date_saved /mnt/ram0/var/local/ #created in rc.shutdown.
   echo "#!/bin/sh
 echo 'Now running in ramdisk, performing filesystem check of ${PDEV1}...'
 /bin/busybox mount -t proc none /proc
-/sbin/hwclock --hctosys --localtime
+HWDATE=\"\`/sbin/hwclock --show 2>/dev/null\`\" #ex: Fri 29 Jun 2012 07:45:28 AM WST  -0.725833 seconds
+if [ \"\$HWDATE\" = \"\" ];then
+ if [ -f /var/local/shutdown_date_saved ];then #see /etc/rc.d/rc.shutdown
+  HWDATE=\"\`/bin/busybox cat /var/local/shutdown_date_saved\`\"
+ else
+  #either of these formats can set the date: '29 JUN 2012 10:00:00' '2012-06-28 16:20:08'
+  HWDATE=\"\`/bin/busybox stat --format=%z /etc/DISTRO_SPECS | /bin/busybox cut -f 1 -d '.' | /bin/busybox cut -f 1,2 -d ' '\`\" #creation date of build. ex: '2012-06-28 16:20:08'
+ fi
+ /bin/busybox date -s \"\$HWDATE\"
+else
+ /sbin/hwclock --hctosys --localtime
+fi
 /bin/busybox umount /old_root
-[ $? -ne 0 ] && echo 'Not so good, was unable to unmount ${PDEV1}. Continuing with f.s. check...'
+if [ \$? -ne 0 ];then
+ echo 'Not so good, was unable to unmount ${PDEV1}. Continuing with f.s. check...'
+ /bin/busybox umount -r /old_root #try to remount read-only.
+ if [ \$? -ne 0 ];then
+  echo 'Unable to remount read-only, still continuing with f.s. check...'
+ else
+  echo 'Remounted read-only, continuing with f.s. check...'
+ fi
+fi
 /sbin/e2fsck -p -f /dev/${PDEV1}
 /bin/busybox sync
 echo 'Filesystem check completed!'
 echo 'The computer now has to be restarted.'
 echo 'Computer will reboot in 4 minutes, else press ENTER for immediate reboot.'
@@ -133,12 +162,13 @@
   rm -rf /tmp/*
   rm -f /var/lock/LCK*
   rm -f /var/run/*.pid
   rm -rf /root/tmp 2>/dev/null
   rm -rf /root/.thumbnails/* 2>/dev/null
-  rm -f `find /var -mount -type s | tr '\n' ' '` #remove sockets.
-  rm -f `find /var -mount -type p | tr '\n' ' '` #remove pipes.
+  #120716 weird bug raspi, can't find 'tr', so use 'busybox tr'...
+  rm -f `find /var -mount -type s | busybox tr '\n' ' '` #remove sockets.
+  rm -f `find /var -mount -type p | busybox tr '\n' ' '` #remove pipes.
   sync
   #pivot_root to the ramdisk...
   echo 'Performing a pivot_root to the ramdisk...'  >/dev/console
   busybox mount -o remount,ro /
   busybox umount /proc

Changes to woof-distro/Packages-puppy-noarch-official

@@ -100,10 +100,11 @@
 pzchmview-1.0d-1|pzchmview|1.0d-1||Document|28K||pzchmview-1.0d-1.pet|+chmlib|PZCHMView CHM Viewer||||
 sfs-converter-1.3.2-1|sfs-converter|1.3.2-1||Setup|44K||sfs-converter-1.3.2-1.pet|+gtkdialog3,+squashfs-tools,+squashfs-tools4|Utility to convert sfs 3 to 4, vice versa||||
 sfs_load-1.9.6|sfs_load|1.9.6||Setup|196K||sfs_load-1.9.6.pet||Load Squash files||||
 shared-mime-info-0.70-6|shared-mime-info|0.70-6||BuildingBlock|272K||shared-mime-info-0.70-6.pet||mime information||||
 shared-mime-info_DEV-0.70-6|shared-mime-info_DEV|0.70-6||BuildingBlock|3772K||shared-mime-info_DEV-0.70-6.pet|+shared-mime-info|mime information||||
+simple_wall_set-0.6-noarch|simple_wall_set|0.6-noarch||Desktop|80K||simple_wall_set-0.6-noarch.pet|+gtkdialog4|SWS simple wallpaper setter||||
 snap2-4.21|snap2|4.21||Utility|152K||snap2-4.21.pet|+rsync|Snap2 snapshot backup||||
 ssh_gui-0.7.1-1-p4|ssh_gui|0.7.1-1-p4||Internet|40K||ssh_gui-0.7.1-1-p4.pet|+gtk+,+openssh_client|secure telnet gui|puppy|4||
 usb-modeswitch-data-20111023|usb-modeswitch-data|20111023||BuildingBlock|892K||usb-modeswitch-data-20111023.pet||data for usb-modeswitch pkg||||
 wallpaper-0.6.1-1|wallpaper|0.6.1-1||Desktop|116K||wallpaper-0.6.1-1.pet|+gtkdialog4|Set backdrop image||||
 wcpufreq-0.8|wcpufreq|0.8||System|53K||wcpufreq-0.8.pet||CPU Frequency Scaling Tool||||

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

@@ -552,11 +552,11 @@
 yes|puppyserialdetect||exe
 yes|pupradio||exe,dev,doc,nls
 no|puptv||exe
 yes|pupx||exe
 yes|pure-ftpd||exe,dev,doc,nls| #needed by pcurlftp_file_sharing.
-yes|pwallpaper||exe
+no|pwallpaper||exe| #segfault in raspi. use simple_wall_set instead.
 no|pwget||exe
 no|pwireless||exe
 yes|pwsget||exe
 yes|python|python,python2.5-minimal,python2.5|exe>dev,dev,doc,nls
 yes|python-libxml2|python-libxml2|exe>dev,dev,doc,nls|+libxml2
@@ -600,10 +600,11 @@
 no|sfs_load||exe,dev,doc,nls
 no|sgmixer||exe
 yes|sgml-base|sgml-base|exe>dev,dev,doc>dev,nls
 yes|sgml-data|sgml-data|exe>dev,dev,doc>dev,nls
 yes|shared-mime-info||exe,dev
+yes|simple_wall_set||exe
 no|sox||exe,dev,doc,nls
 no|soxgui||exe
 yes|speex|speex,libspeex1,libspeex-dev|exe,dev,doc,nls
 yes|sqlite|sqlite3,libsqlite3-0,libsqlite3-dev|exe,dev,doc,nls
 no|squashfs-tools|squashfs-tools|exe,dev>null,doc,nls

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

@@ -1,9 +1,9 @@
 #One or more words that identify this distribution:
 DISTRO_NAME='Squeezed Arm Puppy'
 #version number of this distribution:
-DISTRO_VERSION=5.102
+DISTRO_VERSION=5.103
 #The distro whose binary packages were used to build this distribution:
 DISTRO_BINARY_COMPAT='debian'
 #Prefix for some filenames: exs: sqzdsave.2fs, sqzd-4.99.0.sfs
 DISTRO_FILE_PREFIX='sap6'
 #The version of the distro whose binary packages were used to build this distro:

Changes to woof-distro/arm/gentoo/gap6/DISTRO_PKGS_SPECS-gentoo-gap6

@@ -477,11 +477,11 @@
 yes|puppyserialdetect||exe
 yes|pupradio||exe,nls
 no|puptv||exe
 yes|pupx||exe
 yes|pure-ftpd||exe,dev,doc,nls| #needed by pcurlftp_file_sharing.
-yes|pwallpaper||exe
+no|pwallpaper||exe
 no|pwget||exe
 no|pwireless||exe
 no|pwireless2||exe
 yes|pwsget||exe
 yes|python|python|exe>dev,dev,doc,nls
@@ -522,10 +522,11 @@
 yes|sfs_load||exe,dev,doc,nls
 no|sgmixer||exe
 yes|sgml-common|sgml-common|exe>dev,dev,doc,nls
 no|shared-mime-info|shared-mime-info|exe,dev,doc,nls|
 yes|shared-mime-info||exe,dev,doc,nls|
+yes|simple_wall_set||exe
 yes|snap2||exe,dev,doc,nls
 no|sox|sox|exe,dev,doc,nls
 no|soxgui||exe
 yes|speex|speex|exe,dev,doc,nls
 yes|sqlite|sqlite|exe,dev,doc,nls

Changes to woof-distro/arm/ubuntu/precise/DISTRO_PKGS_SPECS-ubuntu-precise

@@ -579,11 +579,11 @@
 yes|puppyserialdetect||exe
 yes|pupradio||exe,dev,doc,nls
 no|puptv||exe
 yes|pupx||exe
 yes|pure-ftpd||exe,dev,doc,nls| #needed by pcurlftp_file_sharing.
-yes|pwallpaper||exe
+no|pwallpaper||exe
 no|pwget||exe
 yes|pwsget||exe
 no|pwireless||exe
 yes|python|python,python2.7-minimal,python2.7|exe>dev,dev,doc,nls
 yes|python-libxml2|python-libxml2|exe>dev,dev,doc,nls|+libxml2
@@ -621,10 +621,11 @@
 yes|sfs_load||exe,dev,doc,nls
 no|sgmixer||exe
 yes|sgml-base|sgml-base|exe>dev,dev,doc>dev,nls
 yes|sgml-data|sgml-data|exe>dev,dev,doc>dev,nls
 yes|shared-mime-info||exe,dev
+yes|simple_wall_set||exe
 no|smplayer||exe,dev,doc,nls
 yes|snap2||exe,dev,doc,nls
 yes|sqlite|sqlite3,libsqlite3-0,libsqlite3-dev|exe,dev,doc,nls
 no|squashfs-tools|squashfs-tools|exe,dev>null,doc,nls
 yes|squashfs-tools||exe