Although the noshutdown keyword is nice, we shouldn't use it for network or dhcpcd. Instead fake network shutdown so it comes back up correctly at boot and KILL dhcpcd to preserve network.
This commit is contained in:
parent
824bb3aee3
commit
3d43fb6f22
@ -6,6 +6,8 @@
|
||||
|
||||
# You also have ifup_eth0 and ifdown_eth0 to run other commands when
|
||||
# eth0 is started and stopped.
|
||||
# You should note that we don't stop the network at system shutdown by default.
|
||||
# If you really need this, then set shutdown_network=YES
|
||||
|
||||
# You can assign a default route
|
||||
#defaultroute="192.168.0.1"
|
||||
|
@ -14,5 +14,14 @@ depend()
|
||||
use logger
|
||||
after bootmisc modules
|
||||
before dns
|
||||
keyword noshutdown
|
||||
}
|
||||
|
||||
stop_pre()
|
||||
{
|
||||
# When shutting down, kill dhcpcd but preserve network
|
||||
# We do this as /var/run/dhcpcd could be cleaned out when we
|
||||
# return to multiuser.
|
||||
if yesno $RC_GOINGDOWN; then
|
||||
: ${stopsig:=SIGKILL}
|
||||
fi
|
||||
}
|
||||
|
@ -13,8 +13,6 @@ depend()
|
||||
need localmount
|
||||
after bootmisc
|
||||
provide net
|
||||
# We don't want to stop the network at shutdown
|
||||
keyword noshutdown
|
||||
keyword nojail noprefix novserver
|
||||
}
|
||||
|
||||
@ -240,6 +238,11 @@ start()
|
||||
|
||||
stop()
|
||||
{
|
||||
# Don't stop the network at shutdown.
|
||||
# We don't use the noshutdown keyword so that we are started again
|
||||
# correctly if we go back to multiuser.
|
||||
! yesno ${shutdown_network:-YES} && yesno $RC_GOINGDOWN && return 0
|
||||
|
||||
local int= intv= cmd= downcmd= r=
|
||||
einfo "Stopping network"
|
||||
routeflush
|
||||
|
Loading…
Reference in New Issue
Block a user