diff options
| -rw-r--r-- | initscripts.spec | 2 | ||||
| -rw-r--r-- | src/ppp-watch.c | 10 | ||||
| -rw-r--r-- | sysconfig.txt | 3 |
3 files changed, 14 insertions, 1 deletions
diff --git a/initscripts.spec b/initscripts.spec index f56139e2..08e26e01 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -247,6 +247,8 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Jan 29 2001 Bill Nottingham <notting@redhat.com> - add plusb support (#18892, patch from <eric.ayers@compgen.com>) +- don't ignore RETRYTIMEOUT when we never connect (#14071, patch from + <ak@cave.hop.stu.neva.ru>) * Wed Jan 24 2001 Bill Nottingham <notting@redhat.com> - quiet LVM setup (#24841) diff --git a/src/ppp-watch.c b/src/ppp-watch.c index 7bc483ae..3bbe9982 100644 --- a/src/ppp-watch.c +++ b/src/ppp-watch.c @@ -489,8 +489,16 @@ main(int argc, char **argv) { set_signal(SIGIO, signal_handler); set_signal(SIGCHLD, signal_handler); if (theBoot) { + temp = svGetValue(ifcfg, "BOOTTIMEOUT"); + if (temp) { + timeout = atoi(temp); + if (timeout < 1) timeout = 1; + free(temp); + } else { + timeout = 30; + } set_signal(SIGALRM, signal_handler); - alarm(30); + alarm(timeout); } fork_exec(1, "/sbin/netreport", NULL, NULL, NULL); diff --git a/sysconfig.txt b/sysconfig.txt index 8f877c32..d77206c8 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -438,6 +438,9 @@ Files in /etc/sysconfig/network-scripts/ IDLETIMEOUT=600 The amount of time the link needs to be inactive before pppd will bring it down automatically. + BOOTTIMEOUT=30 + The amount of time to wait at boot before giving up on the + connection. /etc/sysconfig/network-scripts/chat-<interface-name>: |