diff options
| author | Colin Guthrie <colin@mageia.org> | 2012-03-26 00:00:37 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2012-03-26 00:00:37 +0100 |
| commit | aa8de7fb7bf2a088ed3e1b85e100b8ad44d7e379 (patch) | |
| tree | aae249d78978b5edfefe497f1992c6d44cf83472 | |
| parent | 71b3052e374c59275dec95297102c55f4dc6f98d (diff) | |
| download | initscripts-aa8de7fb7bf2a088ed3e1b85e100b8ad44d7e379.tar initscripts-aa8de7fb7bf2a088ed3e1b85e100b8ad44d7e379.tar.gz initscripts-aa8de7fb7bf2a088ed3e1b85e100b8ad44d7e379.tar.bz2 initscripts-aa8de7fb7bf2a088ed3e1b85e100b8ad44d7e379.tar.xz initscripts-aa8de7fb7bf2a088ed3e1b85e100b8ad44d7e379.zip | |
Make network and network-up start after NetworkManager should it be enabled.
Both scripts will check to see if NetworkManager is running before deciding
to ignore interfaces. This directive will ensure that systemd starts
NetworkManager before running these scripts and thus any checks and probes
will be valid.
This should prevent the double running of wpa_supplicant if the network
script was run before NetworkManager which can cause constant disconnects.
| -rwxr-xr-x | mandriva/network-up | 2 | ||||
| -rwxr-xr-x | rc.d/init.d/network | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/mandriva/network-up b/mandriva/network-up index 02cec997..00ee303d 100755 --- a/mandriva/network-up +++ b/mandriva/network-up @@ -2,7 +2,7 @@ # ### BEGIN INIT INFO # Provides: $network $named -# Should-Start: portreserve +# Should-Start: portreserve NetworkManager # Required-Start: network # Required-Stop: network # Default-Start: 2 3 4 5 diff --git a/rc.d/init.d/network b/rc.d/init.d/network index 72c5d151..95ed7be7 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -9,15 +9,12 @@ # ### BEGIN INIT INFO # Provides: network -# Should-Start: harddrake irda resolvconf slmodemd +# Should-Start: harddrake irda resolvconf slmodemd iptables ip6tables NetworkManager # Should-Stop: irda resolvconf slmodemd # Default-Start: 2 3 4 5 # Short-Description: Bring up/down networking # Description: Activates/Deactivates all network interfaces configured to # start at boot time. -# Should-Start: iptables ip6tables -# Short-Description: Bring up/down networking -# Description: Bring up/down networking ### END INIT INFO # Source function library. |