Check-in [fdcf56890f]
Not logged in

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

Overview

SHA1 Hash:fdcf56890f4fdc23264c9461aebaf9c4075435cc
Date: 2012-09-27 02:44:24
User: BarryK
Comment:rerwin: fixes for /usr/sbin/modemprobe_erase, pupdial, refer forum t=76961&start=690

Tags And Properties
Changes

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

@@ -3,10 +3,11 @@
 #delete current modem setting.
 #v416 manage linuxant modems
 #v432 Undo automatic HCF/HSF overrides if modem selection is already cleared, to require second erase to reset the overrides.
 #101203 bk: modified.
 #120201 BK: internationalized.
+#120924 rerwin: Extend to all linuxant modems the modemx file removal on erase-with-no-modem-set,.
 
 export TEXTDOMAIN=modemprobe_erase
 export OUTPUT_CHARSET=UTF-8
 
 KERNVER="`uname -r`"
@@ -14,15 +15,17 @@
 rm -f /dev/modem
 
 #v432 If no modem currently "detected", reset ALSA override of HSF driver (and vice versa).
 if [ ! -e /etc/wvdial.conf ] \
   || grep -q -E '^Modem = (/dev/MYDEVM|MYDEVM)' /etc/wvdial.conf;then
- rm -f /etc/modprobe.d/modemx_hsfmc97xxx.conf #101115
+ rm -f /etc/modprobe.d/modemx_dgc* #120924
+ rm -f /etc/modprobe.d/modemx_hcf* #120924
+ rm -f /etc/modprobe.d/modemx_hsf* #120924
 fi #v432 end
 
 #100908 Delete modem configuration files, to allow fresh start.
-rm -f /etc/modprobe.d/modem_* `ls -1 /etc/modprobe.d/modemx_* 2>/dev/null | grep -v 'hsfmc97xxx' | tr '\n' ' '` #101115
+rm -f /etc/modprobe.d/modem_* #120924
 
 #100909 Reset config file modem and alternate.
 [ -e /etc/wvdial.conf ] \
  && sed -i \
   -e 's%^Modem = .*%Modem = MYDEVM%' \

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

@@ -30,10 +30,11 @@
 #101218 passed param if re-run this script do not do probe of hotpluggable modems.
 #110505 support sudo for non-root user.
 #120202 rodin.s: internationalized.
 #120218 rerwin: Ensure non-null logon info for wvdial.
 #120329 Xdialog bug --yesno supposed to "yes" "No" buttons, but they are "OK" "Cancel".
+#120924 rerwin: correct setting of current modem device after erase.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
 
 export TEXTDOMAIN=pupdial
 export TEXTDOMAINDIR=/usr/share/locale
@@ -710,12 +711,15 @@
 [ ! ${ENTRYACC1USER} ] && ENTRYACC1USER="MYUSERNAME"
 [ ! ${ENTRYACC1PASS} ] && ENTRYACC1PASS="MYPASSWORD"
 [ ! ${ENTRYACC2USER} ] && ENTRYACC2USER="MY2USERNAME"
 [ ! ${ENTRYACC2PASS} ] && ENTRYACC2PASS="MY2PASSWORD"
 
+MODEMDEVM="/dev/${DEVM}" #120924
+[ "${DEVM}" = "MYDEVM" ] && MODEMDEVM="MYDEVM" #120924
+
 echo '[Dialer Defaults]' > /etc/wvdial.conf
-echo -n "Modem = /dev/${DEVM}
+echo -n "Modem = ${MODEMDEVM}
 ${DEVMALTLINE}Baud = ${ENTRYBAUDM}
 Init1 =
 Init2 = ${ENTRYINIT2M}
 Init3 = ${ENTRYINIT3M}
 Carrier Check = ${CHECKCC}

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

@@ -93,11 +93,11 @@
 pmusic-2.6.6|pmusic|2.6.6||Multimedia|796K||pmusic-2.6.6.pet|+gtkdialog4,+ffmpeg,+cdrkit,+wget,+pschedule,+pburn,+streamripper,+pfilesearch|-Player -Manager -Grabber|||official|
 pmusic_index_radio-2011.06.26-1|pmusic_index_radio|2011.06.26-1||Multimedia|544K||pmusic_index_radio-2011.06.26-1.pet|+pmusic|Pmusic radio index||||
 pnethood-0.7.i18n|pnethood|0.7.i18n||Network|108K||pnethood-0.7.i18n.pet|+nbtscan,+mountcifs,+samba_client|connect to samba shares||||
 pplog-1.1.3|pplog|1.1.3||Personal|188K||pplog-1.1.3.pet|+perl_tiny,+httpd|PPLOG personal blog, forked from the official 1.1.2 pplog project||||
 pprocess-2.3.2|pprocess|2.3.2||System|56K||pprocess-2.3.2.pet|+gtkdialog4|Pprocess process manager||||
-precord-7.0.2|precord|7.0.2||Multimedia|92K||precord-7.0.2.pet|+ffmpeg,+gtkdialog3,+vorbis-tools,+lame,+alsa-utils|Precord mp3,ogg,wav recorder/player, created by mcewanw||||
+precord-8.0.8|precord|8.0.8||Multimedia|96K||precord-8.0.8.pet|+ffmpeg,+gtkdialog3,+vorbis-tools,+lame,+alsa-utils|Precord mp3,ogg,wav recorder/player||||
 prename-0.7|prename|0.7||Filesystem|48K||prename-0.7.pet|+gtkdialog3|batch file renamer||||
 programchooser-0.3|programchooser|0.3||BuildingBlock|76K||programchooser-0.3.pet|+gtkdialog3|used by wallpaper-setter||||
 pschedule-1.0.2|pschedule|1.0.2||System|84K||pschedule-1.0.2.pet|+gtkdialog3|Pschedule task on time||||
 pstopwatch-0.6|pstopwatch|0.6||Personal|76K||pstopwatch-0.6.pet||simple stop watch||||
 pstreamvid-1.3-2|pstreamvid|1.3-2||Multimedia|96K||pstreamvid-1.3-2.pet|+gxine,+gtkdialog3|Pstreamvid play streaming video||||

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

@@ -368,10 +368,11 @@
 viewnior-1.1|viewnior|1.1||Graphic|200K||viewnior-1.1.pet|+gtk+|Elegant Image Viewer, note compiled in Wary should work in all puppies||||
 viewnior_DOC-1.1|viewnior_DOC|1.1||Graphic|24K||viewnior_DOC-1.1.pet||Simple image viewer||||
 viewnior_NLS-1.1|viewnior_NLS|1.1||Graphic|448K||viewnior_NLS-1.1.pet|+viewnior|Simple image viewer||||
 vobcopy-1.1.1|vobcopy|1.1.1||BuildingBlock|48K||vobcopy-1.1.1.pet|+libdvdread|used for dvd ripping|puppy|4||
 waitmax-1.0|waitmax|1.0||BuildingBlock|40K||waitmax-1.0.pet||exec with timeout, compiled statically||||
+wakepup2-20120812|wakepup2|20120812||Setup|1480K||wakepup2-20120812.pet||WakePup create boot floppy disk||||
 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||||
 woo-ff-0.1.1|woo-ff|0.1.1||Multimedia|48K||woo-ff-0.1.1.pet|+ffmpeg,+gtkdialog3|woo-ff - multimedia converter||||
 xarchive-0.2.8.6.i18n-w5c|xarchive|0.2.8.6.i18n-w5c||Setup|212K||xarchive-0.2.8.6.i18n-w5c.pet|+gtk+|XArchive archiver, internationalised by rodin.s||||
 xclip-0.10|xclip|0.10||BuildingBlock|60K||xclip-0.10.pet||copy/paste x-selection and clipboard from script|puppy|4||

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

@@ -305,11 +305,11 @@
 gdk-pixbuf_NLS-2.22.1-w5c|gdk-pixbuf_NLS|2.22.1-w5c||BuildingBlock|3080K||gdk-pixbuf_NLS-2.22.1-w5c.pet|+gdk-pixbuf|libs to display images|puppy|wary5||
 geany-0.19.1-2-w5|geany|0.19.1-2-w5||Document|2132K||geany-0.19.1-2-w5.pet|+gtk+|Geany text editor|puppy|wary5||
 gecko-mediaplayer-1.0.3-w5|gecko-mediaplayer|1.0.3-w5||Internet|560K||gecko-mediaplayer-1.0.3-w5.pet|+gnome-mplayer,+dbus|media player web-browser plugin, designed to work with Gnome-mplayer|puppy|wary5||
 gecko-mediaplayer_DOC-1.0.3-w5|gecko-mediaplayer_DOC|1.0.3-w5||Internet|76K||gecko-mediaplayer_DOC-1.0.3-w5.pet||media player web-browser plugin||||
 gecko-mediaplayer_NLS-1.0.3-w5|gecko-mediaplayer_NLS|1.0.3-w5||Internet|136K||gecko-mediaplayer_NLS-1.0.3-w5.pet|+gecko-mediaplayer|media player web-browser plugin||||
-geeqie-1.0-i486|geeqie|1.0-i486||Graphic|1060K||geeqie-1.0-i486.pet||Picture Viewer|puppy|wary5||
+geeqie-1.0alpha3-i486|geeqie|1.0alpha3-i486||Graphic|972K||geeqie-1.0alpha3-i486.pet|+gtk+|Geeqie Image Viewer|puppy|||
 gegl-0.1.2-w5|gegl|0.1.2-w5||BuildingBlock|1456K||gegl-0.1.2-w5.pet|+babl|library needed by gimp|puppy|wary5||
 gegl_DEV-0.1.2-w5|gegl_DEV|0.1.2-w5||BuildingBlock|592K||gegl_DEV-0.1.2-w5.pet|+gegl|dev files|puppy|wary5||
 gegl_DOC-0.1.2-w5|gegl_DOC|0.1.2-w5||BuildingBlock|200K||gegl_DOC-0.1.2-w5.pet||docs for gegl||||
 gettext-0.17-1-w5c|gettext|0.17-1-w5c||BuildingBlock|100K||gettext-0.17-1-w5c.pet||A program internationalization library and tools|puppy|wary5||
 gettext-tools_DEV-0.17-w5c|gettext-tools_DEV|0.17-w5c||BuildingBlock|4220K||gettext-tools_DEV-0.17-w5c.pet|+gettext-tools|A program internationalization library and tools|puppy|wary5||