Check-in [df52b04e76]
Not logged in

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

Overview

SHA1 Hash:df52b04e7651fcf0a76bf35075c0e8a0b00b4372
Date: 2012-01-03 23:15:00
User: BarryK
Comment:fix incorrect desktop drv icon mntd status, add firmware for rtl8192se.ko wireless drvr

Tags And Properties
Changes

Changes to woof-code/kernel-skeleton/etc/modules/firmware.dep

@@ -37,10 +37,11 @@
 prism54_firmware:prism54.ko,p54pci.ko,p54usb.ko
 rt2860sta-fw:rt2860sta.ko
 rt2870sta-fw:rt2870sta.ko
 rt2x00:rt2x00pci.ko,rt2x00usb.ko,rt61pci.ko,rt73usb.ko,rt2400pci.ko,rt2500pci.ko,rt2500usb.ko
 rtl8188_8192su:r8192s_usb.ko
+rtl8192se:rtl8192se.ko
 zd1201_firmware:zd1201.ko
 zd1211_firmware:zd1211rw.ko
 #media drivers...
 qc-usb-messenger:qcmessenger.ko
 dvb-usb-firmware:dvb-usb-a800.ko,dvb-usb-af9005.ko,dvb-usb-au6610.ko,dvb-usb-cxusb.ko,dvb-usb-dib0700.ko,dvb-usb-dibusb-mb.ko,dvb-usb-dibusb-mc.ko,dvb-usb-digitv.ko,dvb-usb-dtt200u.ko,dvb-usb-gl861.ko,dvb-usb-gp8psk.ko,dvb-usb-m920x.ko,dvb-usb-nova-t-usb2.ko,dvb-usb-opera.ko,dvb-usb-ttusb2.ko,dvb-usb-umt-010.ko,dvb-usb-vp702x.ko,dvb-usb-vp7045.ko

Changes to woof-code/kernel-skeleton/lib/modules/all-firmware/rtl8192se/lib/firmware/rtlwifi/rtl8192sefw.bin

cannot compute difference between binary files

Changes to woof-code/rootfs-skeleton/bin/umount

@@ -3,10 +3,11 @@
 #2007 Lesser GPL licence v2 (http://www.fsf.org/licensing/licenses/lgpl.html)
 #v406 support for old kernel /dev/hd*.
 #v407 fix for floppy drive icon.
 #v409 gparted create ext3 part. failed, fixed by making /etc/mtab a symlink.
 #v423 recent version busybox umount, default for umount is to not free loop device, needs -d.
+#120104 a bug if more than 9 partitions in drive, desktop icons may display incorrect mounted status.
 
 #mount-FULL, umount-FULL, losetup-FULL are the full versions.
 #The Busybox versions of mount and umount are available but only by:
 # # busybox mount ...
 # # busybox umount ...
@@ -69,15 +70,15 @@
  else
   DEVNAME="`echo "${MNTDDEVS1}
 ${MNTDDEVS2}" | sort | uniq -u | head -n 1`" #head is a precaution.
  fi
  if [ "$DEVNAME" != "" -a "$DISPLAY" != "" ];then
-  DRVNAME="`echo -n "$DEVNAME" | cut -b 1-3`"
+  DRVNAME="`echo -n "$DEVNAME" | cut -b 1-3`" #ex: DRVNAME=sda
   #special case, SD card /dev/mmcblk0p1...
   [ "$DRVNAME" = "mmc" ] && DRVNAME="`echo -n "$DEVNAME" | sed -e 's/p[0-9]$//'`"
   xDRVNAME="$DRVNAME" #v404
-  [ -d /root/.pup_event/drive_${DEVNAME} ] && DRVNAME="$DEVNAME" #icon for each partition.
+  [ -d /root/.pup_event/drive_${DEVNAME} ] && DRVNAME="$DEVNAME" #icon for each partition. ex: DRVNAME=sda1
   if [ -d /root/.pup_event/drive_${DRVNAME} ];then
    case $DRVNAME in #v407
     fd*)
      DRV_CATEGORY="floppy"
     ;;
@@ -86,10 +87,12 @@
      DRV_CATEGORY="`probedisk2 | grep "$dnPATTERN" | cut -f 2 -d '|'`"
     ;;
    esac
    #if any partitions still mounted, leave "MNTD" on icon...
    drvPATTERN='^/dev/'"${DRVNAME}" #important, no space on end.
+   #120104 a bug if more than 9 partitions in drive, ex DRVNAME=sda1 xDRVNAME=sda, df test below must ignore sda10 etc...
+   [ "$DRVNAME" != "$xDRVNAME" ] && drvPATTERN='^/dev/'"${DRVNAME}"' ' #120104 we do want a space on end.
    #"MNTD" text is intended as a reminder to user that drive needs to be unmounted,
    #   but partitions in use by Puppy cannot be unmounted.
    if [ "`df | tr -s ' ' | cut -f 1,6 -d ' ' | grep "$drvPATTERN" | grep -v ' /initrd/' | grep -v ' /$'`" = "" ];then
     if [ "`df | tr -s ' ' | cut -f 1,6 -d ' ' | grep "$drvPATTERN" | grep -E ' /initrd/| /$'`" != "" ];then
      #only a partition left mntd that is in use by puppy, change green->yellow...