(old)Puppy Linux Discussion Forum

Code: Select all

--- /usr/sbin/modemprobe_erase	2012-02-01 06:58:19.000000000 -0500
+++ modemprobe_erase	2012-09-24 12:13:26.000000000 -0400
@@ -5,6 +5,7 @@
 #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
@@ -16,11 +17,13 @@
 #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 ] \

Code: Select all

--- /usr/sbin/pupdial	2012-05-14 04:52:50.000000000 -0400
+++ pupdial	2012-09-25 20:00:39.000000000 -0400
@@ -32,6 +32,7 @@
 #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
 
@@ -712,8 +713,11 @@
 [ ! ${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}

Code: Select all

./configure --with-default-mixerapp=retrovol --enable-nls --prefix=/usr
make
make install DESTDIR=/root/temp

Code: Select all

./configure    release intl  --prefix=/usr