Check-in [e82716c2f7]
Not logged in

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

Overview

SHA1 Hash:e82716c2f7cb91528c4645521d8d8d48a4df000c
Date: 2012-01-30 02:21:22
User: BarryK
Comment:Underdog Linux, last seen in Puppy 2.x, has returned

Tags And Properties
Changes

Changes to woof-code/boot/initrd-tree0/init

@@ -124,10 +124,11 @@
 #110722 fix deleting of old boot scripts.
 #110810 some builds may have many scsi drivers in initrd, if needed will have already loaded, so delete them.
 #110810 problem kernel numbering 2.6.32-40, 2.6.32-44 both in /lib/modules/2.6.32.
 #111003 ldolse: pemasu 2.6.39 kernel showing usb at also ata, causing double writes to /tmp/PUPSAVES.
 #111120 workarounds for missing support utilities: fusermount (no longer needed), e2fsck, resize2fs
+#120130 bring back Underdog Linux. Refer "take 2": http://puppylinux.com/development/howpuppyworks.html
 
 #Unionfs layers setup by this script...
 #unionfs layers:            RW (top)      RO1             RO2              PUPMODE
 #full install, flash drive: tmpfs         PDEV1                            3
 #First boot (or pfix=ram):  tmpfs                         pup_xxx.sfs      5
@@ -467,10 +468,12 @@
 [ $PSUBDIR ] && [ "`echo -n "$PSUBDIR" | cut -c 1`" != "/" ] && PSUBDIR="/${PSUBDIR}" #add leading /.
 
 #100915 requested by technosaurus (formats get changed further down)...
 [ $pupsfs ] && PUPSFS=$pupsfs #format partition:<path><filename> ex: sda2:/wary071/wary_071.sfs
 [ $zdrv ] && ZDRV=$zdrv #ex: sda2:/wary071/zdrv_071.sfs
+
+[ $underdog ] && UNDERDOG=$underdog #120130 specify partition for Underdog Linux (refer also underdog.lnx).
 
 #now supporting a boot menu...
 RDSH=""
 if [ "$pfix" ];then
  for ONEFIX in `echo -n "$pfix" | tr ',' ' '`
@@ -1422,10 +1425,11 @@
 
 ######################SETUP LAYERED FILESYSTEM########################
 echo -n "Setting up the layered filesystem..." > /dev/console #STEP FIVE
 #are there any other sfs files to load at bottom layers?...
 NEWUNIONRECORD=""
+CNTLOOP=4 ; UMNTRO=""
 if [ "$PUPSAVE" != "" ];then
  if [ "$SMNTPT" != "" -o $PUPMODE -eq 77 ];then #v3.97
   touch /tmp/EXTRASFSS #100711
   SFSSDIR="$SMNTPT"
   #100711 look in top and in psubdir...
@@ -1447,13 +1451,12 @@
     [ "`echo "$ONEBASE" | grep -E "$exPATTERN"`" != "" ] && continue
     [ "`grep "$ONEBASE" /tmp/EXTRASFSS`" != "" ] && continue #100711 avoid loading duplicates.
     [ "`echo "$EXTRASFSLIST" | grep "$ONEBASE"`" != "" ] && echo "${ONEEXTRA}" >> /tmp/EXTRASFSS
    done
   fi
-  UMNTRO="" ; EXTRASFSLIST=""
-  if [ -s /tmp/EXTRASFSS ];then #100711
-   CNTLOOP=4
+  EXTRASFSLIST=""
+  if [ -s /tmp/EXTRASFSS ];then #100711
    for ONEEXTRA in `cat /tmp/EXTRASFSS | tr '\n' ' '`
    do
     ONEBASE="`basename $ONEEXTRA`"
     EXTRASFSLIST="${EXTRASFSLIST}${ONEBASE} " #construct list of actually used.
     losetup /dev/loop${CNTLOOP} $ONEEXTRA
@@ -1471,10 +1474,44 @@
   SAVEFILENAMEONLY="`basename $SAVEFILE`"
   SFSFILE="`echo -n "$PUPSFS" | cut -f 3 -d ','`"
   SFSFILENAMEONLY="`basename $SFSFILE`"
   RECORDLIST="$SAVEFILENAMEONLY $SFSFILENAMEONLY $EXTRASFSLIST $ZFACTOR" #v426
   NEWUNIONRECORD="`echo "$RECORDLIST" | tr -s ' '  | sed -e 's/ $//'`"
+
+  #120130 bring back Underdog Linux...
+  [ ! "$UNDERDOG" ] && [ "$xPSUBDIR" ] && [ -f "${SMNTPT}${xPSUBDIR}/underdog.lnx" ] && UNDERDOG="`cat "${SMNTPT}${xPSUBDIR}/underdog.lnx"`"
+  [ ! "$UNDERDOG" ] && [ -f $SFSSDIR/underdog.lnx ] && UNDERDOG="`cat ${SFSSDIR}/underdog.lnx`"
+
+ fi
+fi
+
+#120130 bring back Underdog Linux...
+if [ "$UNDERDOG" ];then #note, 'underdog' can also be specified on kernel commandline.
+ udPTN1="${UNDERDOG}|"
+ FNDPART="`echo "$PCPARTS0" | grep "$udPTN1"`" #ex: sda1|ext3
+ if [ "$FNDPART" ];then
+  udPTN2="^/dev/${UNDERDOG} "
+  UDMNTPT="`mount | grep "$udPTN2" | tr -s ' ' | cut -f 3 -d ' '`"
+  if [ ! "$UDMNTPT" ];then #must not be mounted.
+   udFS="`echo -n "$FNDPART" | cut -f 2 -d '|'`"
+   mount -r -t $udFS /dev/$UNDERDOG /pup_ro${CNTLOOP}
+   if [ $? -eq 0 ];then
+    UMNTRO="${UMNTRO}:/pup_ro${CNTLOOP}=ro"
+    #fixes to prevent library clashes... (got out of puppy 2.x)
+    MNTFIX='/pup_rw'
+    [ "`echo -n "$UMNTRO" | grep 'pup_ro1'`" != "" ] && MNTFIX='/pup_ro1'
+    [ ! -f $MNTFIX/lib/.wh.i686 ] && touch /pup_rw/lib/.wh.i686 #hides /lib/i686
+    #puppy needs dir name /usr/lib/qt at bootup (see rc.profile)...
+    REALQTDIR="`find /pup_ro${CNTLOOP}/usr/lib -maxdepth 1 -type d -name 'qt*' | tail -n 1 | sed -e "s/\/pup_ro${CNTLOOP}\/usr\/lib\///"`"
+    if [ "$REALQTDIR" ];then
+     if [ ! -e $MNTFIX/usr/lib/qt ];then
+      [ "`find /pup_ro${CNTLOOP}/usr/lib -maxdepth 1 -xtype d -name qt`" = "" ] && ln -s $REALQTDIR /pup_rw/usr/lib/qt
+     fi
+    fi
+    CNTLOOP=`expr $CNTLOOP + 1`
+   fi
+  fi
  fi
 fi
 
 #update /etc/rc.d/BOOTCONFIG with latest layered-fs layers configuration... #100222 fix...
 xBOOTCONFIG="`grep -v '^PREVUNIONRECORD' $OLDFILESMNTPT/etc/rc.d/BOOTCONFIG | sed -e 's/^LASTUNIONRECORD/PREVUNIONRECORD/'`"

Changes to woof-distro/x86/Packages-puppy-common-official

@@ -59,12 +59,13 @@
 desk_icon_theme_silver_marble-1|desk_icon_theme_silver_marble|1||Desktop|304K||desk_icon_theme_silver_marble-1.pet||desktop icons||||
 desk_icon_theme_smooth_color-1|desk_icon_theme_smooth_color|1||Desktop|276K||desk_icon_theme_smooth_color-1.pet||desktop and menu icons||||
 desk_icon_theme_stardust-2|desk_icon_theme_stardust|2||Desktop|292K||desk_icon_theme_stardust-2.pet||desktop and menu icons||||
 desk_icon_theme_stark042-1|desk_icon_theme_stark042|1||Desktop|492K||desk_icon_theme_stark042-1.pet|+gtk+|black-white-orange line-art style icons, based on area042 icons||||
 dhcpcd-5.1.5-q1|dhcpcd|5.1.5-q1||BuildingBlock|168K||dhcpcd-5.1.5-q1.pet||network connection client daemon|t2|8.0rc||
-dialog-1.1-20100428-w5|dialog|1.1-20100428-w5||BuildingBlock|124K||dialog-1.1-20100428-w5.pet||A utility for creating text-mode dialog boxes|puppy|wary5||
-dialog_DOC-1.1-20100428-w5|dialog_DOC|1.1-20100428-w5||BuildingBlock|156K||dialog_DOC-1.1-20100428-w5.pet||A utility for creating TTY dialog boxes|puppy|wary5||
+dialog-1.1-20111020-widechar-w5c|dialog|1.1-20111020-widechar-w5c||BuildingBlock|164K||dialog-1.1-20111020-widechar-w5c.pet|+ncurses|create text-mode dialog boxes from scripts, compiled against libncursesw for wide-char unicode support|puppy|wary5||
+dialog_DOC-1.1-20111020-widechar-w5c|dialog_DOC|1.1-20111020-widechar-w5c||BuildingBlock|64K||dialog_DOC-1.1-20111020-widechar-w5c.pet||text-mode dialog boxes||||
+dialog_NLS-1.1-20111020-widechar-w5c|dialog_NLS|1.1-20111020-widechar-w5c||BuildingBlock|640K||dialog_NLS-1.1-20111020-widechar-w5c.pet|+dialog|text-mode dialog boxes||||
 dictd_client-1.10.9|dictd_client|1.10.9||BuildingBlock|112K||dictd_client-1.10.9.pet||dict utility, access online dictionaries|puppy|4||
 didiwiki-0.8-p4|didiwiki|0.8-p4||Personal|92K||didiwiki-0.8-p4.pet||DidiWiki personal wiki|puppy|4||
 dietlibc-0.32-patched-t2-20110407|dietlibc|0.32-patched-t2-20110407||BuildingBlock|4K||dietlibc-0.32-patched-t2-20110407.pet||static c libs||||
 dietlibc_DEV-0.32-patched-t2-20110407|dietlibc_DEV|0.32-patched-t2-20110407||Develop|2456K||dietlibc_DEV-0.32-patched-t2-20110407.pet||c library compile small static executables, compiled quirky141 should work all pups||||
 dietlibc_DOC-0.32-patched-t2-20110407|dietlibc_DOC|0.32-patched-t2-20110407||Develop|24K||dietlibc_DOC-0.32-patched-t2-20110407.pet||c library create small executables||||

Changes to woof-distro/x86/Packages-puppy-wary5-official

@@ -131,12 +131,10 @@
 dhcp-4.2.0-w5c|dhcp|4.2.0-w5c||BuildingBlock|4364K||dhcp-4.2.0-w5c.pet||Dynamic Host Configuration Protocol server and relay agent|puppy|wary5||
 dhcpcd-5.2.12-1-w5|dhcpcd|5.2.12-1-w5||BuildingBlock|176K||dhcpcd-5.2.12-1-w5.pet|+linux_kernel&ge2.6.32|network connection client daemon, requires kernel 2.6.32 or greater|puppy|wary5||
 dhcpcd_DOC-5.2.12-1-w5|dhcpcd_DOC|5.2.12-1-w5||BuildingBlock|64K||dhcpcd_DOC-5.2.12-1-w5.pet||network connection client daemon||||
 dhcp_DEV-4.2.0-w5c|dhcp_DEV|4.2.0-w5c||BuildingBlock|292K||dhcp_DEV-4.2.0-w5c.pet|+dhcp|Dynamic Host Configuration Protocol server and relay agent|puppy|wary5||
 dhcp_DOC-4.2.0-w5c|dhcp_DOC|4.2.0-w5c||BuildingBlock|728K||dhcp_DOC-4.2.0-w5c.pet||Dynamic Host Configuration Protocol server and relay agent|puppy|wary5||
-dialog-1.1-20100428-w5c|dialog|1.1-20100428-w5c||BuildingBlock|128K||dialog-1.1-20100428-w5c.pet||A utility for creating text-mode dialog boxes|puppy|wary5||
-dialog_DOC-1.1-20100428-w5c|dialog_DOC|1.1-20100428-w5c||BuildingBlock|164K||dialog_DOC-1.1-20100428-w5c.pet||A utility for creating TTY dialog boxes|puppy|wary5||
 dictd-1.10.11-w5c|dictd|1.10.11-w5c||Network|436K||dictd-1.10.11-w5c.pet||RFC2229 compliant dictionary server|puppy|wary5||
 dictd_DEV-1.10.11-w5c|dictd_DEV|1.10.11-w5c||Network|24K||dictd_DEV-1.10.11-w5c.pet|+dictd|RFC2229 compliant dictionary server|puppy|wary5||
 dictd_DOC-1.10.11-w5c|dictd_DOC|1.10.11-w5c||Network|128K||dictd_DOC-1.10.11-w5c.pet||RFC2229 compliant dictionary server|puppy|wary5||
 dietlibc_DEV-0.32-w5c|dietlibc_DEV|0.32-w5c||BuildingBlock|2448K||dietlibc_DEV-0.32-w5c.pet|+dietlibc|A libc optimized for small size|puppy|wary5||
 dietlibc_DOC-0.32-w5c|dietlibc_DOC|0.32-w5c||BuildingBlock|24K||dietlibc_DOC-0.32-w5c.pet||A libc optimized for small size|puppy|wary5||