From 6945eda6eae78701b5cd5260e004acb2fdefd535 Mon Sep 17 00:00:00 2001 From: Hellmuth Michaelis Date: Sun, 6 Feb 2000 16:33:54 +0000 Subject: Approved by: jkh Reviewed by: joerg The isdnd is able to listen on a socket for isdnmonitor to connect to it to remotely control it (similar to ppp and pppctl). When this is enabled in the isdnd config file, it will fail currently because isdnd is started before the network interfaces are configured. It is necessary to move the isdnd start after the ifconfig of the network interfaces, then this problem will not occur. --- etc/network.subr | 20 ++++++++++---------- etc/rc.d/netoptions | 20 ++++++++++---------- etc/rc.d/network1 | 20 ++++++++++---------- etc/rc.d/network2 | 20 ++++++++++---------- etc/rc.d/network3 | 20 ++++++++++---------- etc/rc.d/routing | 20 ++++++++++---------- etc/rc.network | 20 ++++++++++---------- 7 files changed, 70 insertions(+), 70 deletions(-) diff --git a/etc/network.subr b/etc/network.subr index cf797338a16e..b42bd655242f 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -44,16 +44,6 @@ network_pass1() { ;; esac - # ISDN subsystem startup - # - case ${isdn_enable} in - [Yy][Ee][Ss]) - if [ -r /etc/rc.isdn ]; then - . /etc/rc.isdn - fi - ;; - esac - # Special options for sppp(4) interfaces go here. These need # to go _before_ the general ifconfig section, since in the case # of hardwired (no link1 flag) but required authentication, you @@ -138,6 +128,16 @@ network_pass1() { fi done + # ISDN subsystem startup + # + case ${isdn_enable} in + [Yy][Ee][Ss]) + if [ -r /etc/rc.isdn ]; then + . /etc/rc.isdn + fi + ;; + esac + # Warm up user ppp if required, must happen before natd. # case ${ppp_enable} in diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index cf797338a16e..b42bd655242f 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -44,16 +44,6 @@ network_pass1() { ;; esac - # ISDN subsystem startup - # - case ${isdn_enable} in - [Yy][Ee][Ss]) - if [ -r /etc/rc.isdn ]; then - . /etc/rc.isdn - fi - ;; - esac - # Special options for sppp(4) interfaces go here. These need # to go _before_ the general ifconfig section, since in the case # of hardwired (no link1 flag) but required authentication, you @@ -138,6 +128,16 @@ network_pass1() { fi done + # ISDN subsystem startup + # + case ${isdn_enable} in + [Yy][Ee][Ss]) + if [ -r /etc/rc.isdn ]; then + . /etc/rc.isdn + fi + ;; + esac + # Warm up user ppp if required, must happen before natd. # case ${ppp_enable} in diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index cf797338a16e..b42bd655242f 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -44,16 +44,6 @@ network_pass1() { ;; esac - # ISDN subsystem startup - # - case ${isdn_enable} in - [Yy][Ee][Ss]) - if [ -r /etc/rc.isdn ]; then - . /etc/rc.isdn - fi - ;; - esac - # Special options for sppp(4) interfaces go here. These need # to go _before_ the general ifconfig section, since in the case # of hardwired (no link1 flag) but required authentication, you @@ -138,6 +128,16 @@ network_pass1() { fi done + # ISDN subsystem startup + # + case ${isdn_enable} in + [Yy][Ee][Ss]) + if [ -r /etc/rc.isdn ]; then + . /etc/rc.isdn + fi + ;; + esac + # Warm up user ppp if required, must happen before natd. # case ${ppp_enable} in diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index cf797338a16e..b42bd655242f 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -44,16 +44,6 @@ network_pass1() { ;; esac - # ISDN subsystem startup - # - case ${isdn_enable} in - [Yy][Ee][Ss]) - if [ -r /etc/rc.isdn ]; then - . /etc/rc.isdn - fi - ;; - esac - # Special options for sppp(4) interfaces go here. These need # to go _before_ the general ifconfig section, since in the case # of hardwired (no link1 flag) but required authentication, you @@ -138,6 +128,16 @@ network_pass1() { fi done + # ISDN subsystem startup + # + case ${isdn_enable} in + [Yy][Ee][Ss]) + if [ -r /etc/rc.isdn ]; then + . /etc/rc.isdn + fi + ;; + esac + # Warm up user ppp if required, must happen before natd. # case ${ppp_enable} in diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index cf797338a16e..b42bd655242f 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -44,16 +44,6 @@ network_pass1() { ;; esac - # ISDN subsystem startup - # - case ${isdn_enable} in - [Yy][Ee][Ss]) - if [ -r /etc/rc.isdn ]; then - . /etc/rc.isdn - fi - ;; - esac - # Special options for sppp(4) interfaces go here. These need # to go _before_ the general ifconfig section, since in the case # of hardwired (no link1 flag) but required authentication, you @@ -138,6 +128,16 @@ network_pass1() { fi done + # ISDN subsystem startup + # + case ${isdn_enable} in + [Yy][Ee][Ss]) + if [ -r /etc/rc.isdn ]; then + . /etc/rc.isdn + fi + ;; + esac + # Warm up user ppp if required, must happen before natd. # case ${ppp_enable} in diff --git a/etc/rc.d/routing b/etc/rc.d/routing index cf797338a16e..b42bd655242f 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -44,16 +44,6 @@ network_pass1() { ;; esac - # ISDN subsystem startup - # - case ${isdn_enable} in - [Yy][Ee][Ss]) - if [ -r /etc/rc.isdn ]; then - . /etc/rc.isdn - fi - ;; - esac - # Special options for sppp(4) interfaces go here. These need # to go _before_ the general ifconfig section, since in the case # of hardwired (no link1 flag) but required authentication, you @@ -138,6 +128,16 @@ network_pass1() { fi done + # ISDN subsystem startup + # + case ${isdn_enable} in + [Yy][Ee][Ss]) + if [ -r /etc/rc.isdn ]; then + . /etc/rc.isdn + fi + ;; + esac + # Warm up user ppp if required, must happen before natd. # case ${ppp_enable} in diff --git a/etc/rc.network b/etc/rc.network index cf797338a16e..b42bd655242f 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -44,16 +44,6 @@ network_pass1() { ;; esac - # ISDN subsystem startup - # - case ${isdn_enable} in - [Yy][Ee][Ss]) - if [ -r /etc/rc.isdn ]; then - . /etc/rc.isdn - fi - ;; - esac - # Special options for sppp(4) interfaces go here. These need # to go _before_ the general ifconfig section, since in the case # of hardwired (no link1 flag) but required authentication, you @@ -138,6 +128,16 @@ network_pass1() { fi done + # ISDN subsystem startup + # + case ${isdn_enable} in + [Yy][Ee][Ss]) + if [ -r /etc/rc.isdn ]; then + . /etc/rc.isdn + fi + ;; + esac + # Warm up user ppp if required, must happen before natd. # case ${ppp_enable} in -- cgit v1.3