- pppshutdownsleep patch - configurable sleep on ppp shutdown

  (with some providers ppp requires more than 2 seconds to shutdown)
- release 8

Changed files:
    rc-scripts-pppshutdownsleep.patch -> 1.1
    rc-scripts.spec -> 1.100

diff --git a/rc-scripts-pppshutdownsleep.patch b/rc-scripts-pppshutdownsleep.patch
new file mode 100644 (file)
index 0000000..abf2b1b
--- /dev/null
+++ b/rc-scripts-pppshutdownsleep.patch
@@ -0,0 +1,38 @@
+diff -Nur rc-scripts-0.3.1.orig/sysconfig/interfaces/ifcfg-description rc-scripts-0.3.1/sysconfig/interfaces/ifcfg-description
+--- rc-scripts-0.3.1.orig/sysconfig/interfaces/ifcfg-description       Sat Jul 21 21:18:46 2001
++++ rc-scripts-0.3.1/sysconfig/interfaces/ifcfg-description    Fri Aug 23 17:56:05 2002
+@@ -80,6 +80,7 @@
+               DISCONNECTTIMEOUT=<number of seconds, default currently 5>
+               RETRYTIMEOUT=<number of seconds, default currently 60>
+               INITSCRIPT=<modem command>
++              SHUTDOWNSLEEP=<seconds to wait for pppd shutdown before giving up, default 2>
+               DATAFORCHAT=<list of variables>
+               <anything>=<anything> (for chat script)
+               IPV6_PPP=yes|no (use IPv6 for ppp ?)
+diff -Nur rc-scripts-0.3.1.orig/sysconfig/interfaces/ifcfg-ppp0.tpsa rc-scripts-0.3.1/sysconfig/interfaces/ifcfg-ppp0.tpsa
+--- rc-scripts-0.3.1.orig/sysconfig/interfaces/ifcfg-ppp0.tpsa Thu Aug 16 15:11:20 2001
++++ rc-scripts-0.3.1/sysconfig/interfaces/ifcfg-ppp0.tpsa      Fri Aug 23 17:54:34 2002
+@@ -17,6 +17,7 @@
+ USER=ppp
+ PASSWORD=ppp
+ INITSTRING=ATe0s2=255
++SHUTDOWNSLEEP=10
+ DATAFORCHAT="USER PASSWORD INITSTRING PHONE"
+ 
+ REPORTFILE=/var/log/ppp0.log
+diff -Nur rc-scripts-0.3.1.orig/sysconfig/network-scripts/ifdown-ppp rc-scripts-0.3.1/sysconfig/network-scripts/ifdown-ppp
+--- rc-scripts-0.3.1.orig/sysconfig/network-scripts/ifdown-ppp Tue May 15 18:06:00 2001
++++ rc-scripts-0.3.1/sysconfig/network-scripts/ifdown-ppp      Fri Aug 23 17:52:21 2002
+@@ -38,7 +38,11 @@
+   /etc/sysconfig/network-scripts/ifdown-post $1
+   exit 0
+ fi
+-sleep 2
++if [ -n "$SHUTDOWNSLEEP" ]; then
++  sleep $SHUTDOWNSLEEP
++else
++  sleep 2
++fi
+ if [ ! -d /proc/$PID ]; then
+   /etc/sysconfig/network-scripts/ifdown-post $1
+   exit 0

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 17f9cc3c21d19743463ad2b5d63bd33b9ca333c4..c966cc5d746e6292c509f36eea2e7e321bbb1dc8 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -1,4 +1,4 @@
-# $Id: rc-scripts.spec,v 1.99 2002-08-20 12:19:30 pawelk Exp $
+# $Id: rc-scripts.spec,v 1.100 2002-08-23 16:17:03 qboosh Exp $
 Summary:       inittab and /etc/rc.d scripts
 Summary(de):   inittab und /etc/rc.d Scripts
 Summary(fr):   inittab et scripts /etc/rc.d
@@ -6,7 +6,7 @@ Summary(pl):    inittab i skrypty startowe z katalogu /etc/rc.d
 Summary(tr):   inittab ve /etc/rc.d dosyalarý
 Name:          rc-scripts
 Version:       0.3.1
-Release:       7
+Release:       8
 License:       GPL
 Vendor:                PLD rc-scripts Team <pld-rc-scripts@pld.org.pl>
 Group:         Base
@@ -17,6 +17,7 @@ Patch2:               %{name}-ulimitc.patch
 Patch3:                %{name}-killgnu.patch
 Patch4:                %{name}-wlan.patch
 Patch5:                %{name}-arp-any.patch
+Patch6:                %{name}-pppshutdownsleep.patch
 URL:           http://cvs.pld.org.pl/index.cgi/rc-scripts/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -92,6 +93,7 @@ programc
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 aclocal