Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 493632
Collapse All | Expand All

(-)init.d.NetworkManager.orig (+2 lines)
Lines 23-28 Link Here
23
		--exec /usr/sbin/NetworkManager -- --pid-file /run/NetworkManager/NetworkManager.pid
23
		--exec /usr/sbin/NetworkManager -- --pid-file /run/NetworkManager/NetworkManager.pid
24
	local _retval=$?
24
	local _retval=$?
25
	eend "${_retval}"
25
	eend "${_retval}"
26
	nmcli networking on ||  eerror "Enabling networking failed"
26
	if [ "x${_retval}" = 'x0' ] && ! nm-online -t "${INACTIVE_TIMEOUT}"; then
27
	if [ "x${_retval}" = 'x0' ] && ! nm-online -t "${INACTIVE_TIMEOUT}"; then
27
		einfo "Marking NetworkManager as inactive. It will automatically be marked"
28
		einfo "Marking NetworkManager as inactive. It will automatically be marked"
28
		einfo "as started after a network connection has been established."
29
		einfo "as started after a network connection has been established."
Lines 40-45 Link Here
40
	fi
41
	fi
41
42
42
	ebegin "Stopping NetworkManager"
43
	ebegin "Stopping NetworkManager"
44
	nmcli networking off ||  eerror "Disabling networking failed"
43
	local pidfile=/run/NetworkManager/NetworkManager.pid
45
	local pidfile=/run/NetworkManager/NetworkManager.pid
44
	if [ ! -e "${pidfile}" ] && [ -e /var/run/NetworkManager.pid ]; then 
46
	if [ ! -e "${pidfile}" ] && [ -e /var/run/NetworkManager.pid ]; then 
45
		# Try stopping the pid file used by <0.9.7
47
		# Try stopping the pid file used by <0.9.7

Return to bug 493632