aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts.spec4
-rw-r--r--sysconfig.txt4
-rwxr-xr-xsysconfig/network-scripts/ifup-ppp27
3 files changed, 27 insertions, 8 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 81ef8ed5..2c15992f 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -10,6 +10,7 @@ BuildRoot: /var/tmp/initbld
Requires: mingetty, bash, /bin/awk, /bin/sed, mktemp, e2fsprogs, console-tools
Requires: procps, modutils >= 2.1.85-3, sysklogd >= 1.3.31
Requires: setup >= 2.0.3
+Requires: wvdial >= 1.31
Conflicts: kernel <= 2.2, timeconfig < 3.0
Prereq: /sbin/chkconfig, /usr/sbin/groupadd, gawk
@@ -194,6 +195,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jul 28 1999 Michael K. Johnson <johnsonm@redhat.com>
+- simple wvdial support for ppp connections
+
* Mon Jul 26 1999 Bill Nottingham <notting@redhat.com>
- stability fixes for initlog
- initlog now has a config file
diff --git a/sysconfig.txt b/sysconfig.txt
index b74b561e..f2e6f670 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -257,6 +257,10 @@ Files in /etc/sysconfig/network-scripts/
dip script for this interface)
PPP-specific items
+ WVDIALSECT=<list of sections from wvdial.conf to use>
+ If this variable is set, then the chat script (if it
+ exists) is ignored, and wvdial is used to open the
+ PPP connection.
DEFROUTE=yes|no (set this interface as default route?)
ESCAPECHARS=yes|no (simplified interface here doesn't let people
specify which characters to escape; almost everyone can use
diff --git a/sysconfig/network-scripts/ifup-ppp b/sysconfig/network-scripts/ifup-ppp
index ef3ec4bd..c987bb4d 100755
--- a/sysconfig/network-scripts/ifup-ppp
+++ b/sysconfig/network-scripts/ifup-ppp
@@ -75,20 +75,31 @@ if [ "${DEBUG}" = yes ] ; then
chatdbg="-v"
fi
-CHATSCRIPT=/etc/sysconfig/network-scripts/chat-$DEVNAME
-[ -f $CHATSCRIPT ] || {
- CHATSCRIPT=/etc/sysconfig/network-scripts/chat-$PARENTDEVNAME
-}
+if [ -z "$WVDIALSECT" ] ; then
+ CHATSCRIPT=/etc/sysconfig/network-scripts/chat-$DEVNAME
+ [ -f $CHATSCRIPT ] || {
+ CHATSCRIPT=/etc/sysconfig/network-scripts/chat-$PARENTDEVNAME
+ }
+else
+ CHATSCRIPT=
+fi
while : ; do
(logger -p daemon.info -t ifup-ppp \
"pppd started for $DEVICE on $MODEMPORT at $LINESPEED" &)&
> /var/run/ppp-$DEVICE.dev
- /usr/sbin/pppd -detach $opts $MODEMPORT $LINESPEED \
- remotename $DEVICE ipparam $DEVICE \
- ${PPPOPTIONS} \
- connect "/usr/sbin/chat $chatdbg -f $CHATSCRIPT"
+ if [ -n "$WVDIALSECT ] ; then
+ /usr/sbin/pppd -detach $opts $MODEMPORT $LINESPEED \
+ remotename $DEVICE ipparam $DEVICE \
+ ${PPPOPTIONS} \
+ connect "/usr/bin/wvdial --chat $WVDIALSECT"
+ else
+ /usr/sbin/pppd -detach $opts $MODEMPORT $LINESPEED \
+ remotename $DEVICE ipparam $DEVICE \
+ ${PPPOPTIONS} \
+ connect "/usr/sbin/chat $chatdbg -f $CHATSCRIPT"
+ fi
# exit if we're not supposed to persist or our lock file has disappeared
if [ "$PERSIST" != "yes" -o ! -f /var/run/ppp-$DEVICE.dev ]; then