Check-in [80b4545f72]
Not logged in

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

Overview

SHA1 Hash:80b4545f728dcf7d7ce97d06432f5aabb483f624
Date: 2012-01-02 23:51:34
User: BarryK
Comment:shinobar: ntfs err msg fix, pmount prefs fix, karl godt: partview, rc.shutdown, 10alsa fixes

Tags And Properties
Changes

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

@@ -1,10 +1,11 @@
 #!/bin/sh
 #BK 2006 www.puppylinux.com
 #2007 Lesser GPL licence v2 (http://www.fsf.org/licensing/licenses/lgpl.html)
 #v407 fix for floppy drive icon.
 #v409 gparted create ext3 part. failed, fixed by making /etc/mtab a symlink.
+#120103 shinobar: need 'silent' option for ntfs-3g, avoid err msgs, permissions lost when copy.
 
 #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 ...
@@ -47,21 +48,21 @@
  CMDPRMS="`echo -n "$*" | tr '\t' ' ' | tr -s ' ' | tr ' ' '\n' | grep '^/' | tr '\n' ' '`"
  #kirk advised these options so Rox will not complain about file
  #permissions when copy a file to a ntfs partition...
  [ -f /tmp/ntfsmnterr${MYPID}.txt ] && rm -f /tmp/ntfsmnterr${MYPID}.txt
 
- ntfs-3g $CMDPRMS -o umask=0,no_def_opts 2>/tmp/ntfsmnterr${MYPID}.txt
+ ntfs-3g $CMDPRMS -o umask=0,no_def_opts,silent 2>/tmp/ntfsmnterr${MYPID}.txt #120103 shinobar: need silent
  RETVAL=$?
  #v2.16 ntfs-3g v1.417, part. scheduled for check, failed with value 10...
  #v4.00 ntfs-3g v1.2412 does not have 4,10, has 15 for dirty f.s., 14 hiberneted...
  if [ $RETVAL -eq 4 -o $RETVAL -eq 10 -o $RETVAL -eq 15 -o $RETVAL -eq 14 ];then  #try to force it...
   if [ $RETVAL -eq 14 ];then
    #ntfs-3g $CMDPRMS -o umask=0,no_def_opts,remove_hiberfile 2>/tmp/ntfsmnterr${MYPID}.txt
    #RETVAL=$?
    echo > /dev/null
   else
-   ntfs-3g $CMDPRMS -o force,umask=0,no_def_opts 2>/tmp/ntfsmnterr${MYPID}.txt
+   ntfs-3g $CMDPRMS -o force,umask=0,no_def_opts,silent 2>/tmp/ntfsmnterr${MYPID}.txt #120103 shinobar: need silent.
    RETVAL=$?
    ERRMSG1="`cat /tmp/ntfsmnterr${MYPID}.txt`"
    echo "$ERRMSG1"
    if [ $RETVAL -eq 0 ];then
     echo "WARNING: NTFS f.s. mounted read/write but corrupted."

Changes to woof-code/rootfs-skeleton/etc/init.d/10alsa

@@ -5,10 +5,11 @@
 #101120, 101121 simplification.
 #110111 shinobar: for reliable sound detection on HP Compac nc4010.
 #110113 tweak delay. 110216 tweak delay.
 #110506 /usr/sbin/alsaconf has 'restart' option, might need to reprobe modules. for now, just 'start|restart'.
 #111229 add test file /etc/asound.state exists.
+#120103 karl godt: fix unloading modules. refer: http://www.murga-linux.com/puppy/viewtopic.php?t=71767&start=390
 
 case "$1" in
  start|restart)
   #110217 remove this test, seems to be a problem some people report file not created but snd ok...
   #if [ -f /tmp/rc_d_rc_services_alsa_ok ];then #101121 see rc.services.
@@ -74,15 +75,21 @@
   [ -d /dev/snd ] && fuser -k /dev/snd/* >/dev/null 2>&1
   # remove all sequencer connections if any
   [ -f /proc/asound/seq/clients -a -x aconnect ] && aconnect --removeall
   # mute master to avoid clicks at unload
   amixer set Master mute >/dev/null 2>&1
-  # remove all sound modules
-  lsmod | grep "^snd" | grep -Ev "(snd-page-alloc|snd_page_alloc)" |
-  while read line
-  do
-     rmmod `echo $line | cut -d ' ' -f 1`
+  # remove all sound modules... 120103...
+  #lsmod | grep "^snd" | grep -Ev "(snd-page-alloc|snd_page_alloc)" |
+  c=0
+  while [ "`lsmod | grep 'snd_'`" ];do
+   lsmod | grep "^snd" | grep '0 $' | grep -Ev "(snd-page-alloc|snd_page_alloc)" |
+   while read line
+   do
+    #rmmod `echo $line | cut -d ' ' -f 1`
+    modprobe -rv `echo $line | cut -d ' ' -f 1`
+   done
+   c=$((c+1));[ "$c" = '6' ] && break #precaution if neverending loop
   done
   # remove the 2.2 soundcore module (if possible)
   rmmod soundcore 2> /dev/null
   rmmod gameport 2> /dev/null
   # remove lockfile if lockdir exists

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

@@ -56,10 +56,11 @@
 #110923 L18L: i18n conversion. please see /usr/share/doc/nls/shutdownconfig
 #110928 fixed, reboots when choose shutdown. very old bug, dates back to 2009.
 #110928 modified i18n conversion, only for echo to /dev/console.
 #111106 do not execute fuser if network share mount.
 #111107 ldolse: unmount network shares before taking down the network
+#120103 karl godt: error unmounting stray partitions.
 
 #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
@@ -528,11 +529,11 @@
   xFUSER="`fuser -m $ONESTRAY 2>/dev/null`"
   [ "$xFUSER" != "" ] && fuser -k -m $ONESTRAYMNT 2>/dev/null
  fi
  killzombies #v3.99
  sync
- umount -r $ONESTRAY
+ umount -r $ONESTRAYMNT #120103 karl godt.
 done
 
 swapoff -a #works only if swaps are in mtab or ftab
 #v2.13 menno suggests this improvement...
 STRAYPARTD="`cat /proc/swaps | grep "/dev/" | cut -f 1 -d " " | tr "\n" " "`"

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

@@ -30,10 +30,11 @@
 #101005 maddox: added m_40 cancel message, fixed usage of m_31.
 #110208 zigbert: improve gui layout. bk: put this on-hold for now, see 3 commented lines.
 #110505 support sudo for non-root user.
 #110720 should not open a layer inside aufs, ex: session saved entire partition, desktop drive icon is /initrd/pup_rw.
 #110814 01micko: convert script from gtkdialog2 to gtkdialog3+.
+#120203 preferences was broken.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
 
 #using ${$} which is pid of script...
 MYPID=${$}
@@ -406,20 +407,26 @@
 
 eval "$RETPARAMS"
 
 [ "$EXIT" = "REFRESH" ] && exec /usr/sbin/$PMOUNT $TOPACTUAL
 
-if [ "$EXIT" = "SETPREFS" ];then
- DLGSETENG="
-<window title=\"$m_15\">
- <vbox>
-  <text><label>$m_16</label></text>
-  <checkbox>
+if [ "$HAVEMUT2" = "yes" ];then #120103
+ MUTCHKXML="<checkbox>
    <label>$m_17</label>
    <default>${ENGINEFLAG}</default>
    <variable>NEWENGINEFLAG</variable>
-  </checkbox>
+  </checkbox>"
+else
+ MUTCHKXML="<text use-markup=\"true\"><label>\"<i> -- not available, needs 'mut2' package installed</i>\"</label></text>"
+fi
+
+if [ "$EXIT" = "SETPREFS" ];then
+ DLGSETENG="<window title=\"$m_15\">
+ <vbox>
+  <text><label>$m_16</label></text>
+  ${MUTCHKXML}
+
 
   <text><label>$m_18</label></text>
   <checkbox>
    <label>$m_19</label>
    <default>${SINGLEFLAG}</default>
@@ -439,11 +446,11 @@
   </hbox>
  </vbox>
 </window>
 "
  NEWENGINEFLAG=""
- RETPARAMS="`echo "$DLGSETENG" | gtkdialog3 --stdin`"
+ RETPARAMS="`echo "$DLGSETENG" | gtkdialog4 --stdin`"
  eval "$RETPARAMS"
  if [ "$EXIT" = "OK" ];then
   [ "$NEWENGINEFLAG" = "true" ] && echo -n "mut2" > /root/.pmountengine
   [ "$NEWENGINEFLAG" = "false" ] && echo -n "default" > /root/.pmountengine
   echo "$NEWSINGLEFLAG" > /root/.pmountsingle

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

@@ -41,11 +41,11 @@
 linux_firewall-2.0rc9-puppy2|linux_firewall|2.0rc9-puppy2||Network|132K||linux_firewall-2.0rc9-puppy2.pet||Firewall||||
 linux_firmware_dvb-1.20|linux_firmware_dvb|1.20||BuildingBlock|48K||linux_firmware_dvb-1.20.pet||dvb usb kernel firmware||||
 mplayer_codecs_basic-20071007|mplayer_codecs_basic|20071007||Multimedia|612K||mplayer_codecs_basic-20071007.pet||minimum essential codecs||||
 mscw-1|mscw|1||Setup|36K||mscw-1.pet|+alsa-lib,+gtkdialog3|Multiple Sound Card Wizard||||
 net_setup-20111016|net_setup|20111016||Setup|352K||net_setup-20111016.pet|+gtkdialog3|Network Wizard||||
-partview-2.2|partview|2.2||Filesystem|40K||partview-2.2.pet||Partview free space in drives||||
+partview-2.2-1|partview|2.2-1||Filesystem|40K||partview-2.2-1.pet||Partview free space in drives||||
 pawdioconverter-1.2|pawdioconverter|1.2||Multimedia|208K||pawdioconverter-1.2.pet|+gtkdialog3,+sox|PawdioConverter audio conversion||||
 pbackup-3.1.9|pbackup|3.1.9||Utility|240K||pbackup-3.1.9.pet|+xdialog,+gtkdialog3,+dvd+rwtools,+cdrkit,+curl|Pbackup Backup and Sync||||
 pburn-3.4.1|pburn|3.4.1||Multimedia|336K||pburn-3.4.1.pet|+pfilesearch,+cdrkit,+dvd+rwtools,+gtkdialog4,+normalize,+vcdimager|Pburn CD/DVD/Blu-ray writer||||
 pcd-1.5|pcd|1.5||Multimedia|72K||pcd-1.5.pet|+gtkdialog3,+cdrkit|pCD CD-audio player||||
 pcdripper-3.9.3|pcdripper|3.9.3||Multimedia|96K||pcdripper-3.9.3.pet|+xdialog,+gtkdialog3,+cdrkit|Audio CD song ripper||||