View | Details | Raw Unified | Return to bug 719214
Collapse All | Expand All

(-)a/scripts/network (-3 / +16 lines)
Lines 118-125 systemd_running () { Link Here
118
# /etc/sysconfig/network/scripts/functions
118
# /etc/sysconfig/network/scripts/functions
119
# because they are also used in ifup
119
# because they are also used in ifup
120
#
120
#
121
systemd_running ; sd=$?
121
if [ "$NETWORKMANAGER" = yes ] ; then
122
if [ "$NETWORKMANAGER" = yes ] ; then
122
	systemd_running ; sd=$?
123
	if [ "$FS_FILTER" = "localfs" -o $sd = 1 ] ; then
123
	if [ "$FS_FILTER" = "localfs" -o $sd = 1 ] ; then
124
		# NetworkManager is not supported without remotefs
124
		# NetworkManager is not supported without remotefs
125
		# and will be started later via network-remotefs.
125
		# and will be started later via network-remotefs.
Lines 127-134 if [ "$NETWORKMANAGER" = yes ] ; then Link Here
127
		# under systemd
127
		# under systemd
128
		case $ACTION in
128
		case $ACTION in
129
			(status) exit 3 ;;
129
			(status) exit 3 ;;
130
			(start)  exit 0 ;;
130
			(start)  if [ $sd = 1 ]; then
131
					systemctl start NetworkManager.service
132
				 fi
133
				 exit 0 ;;
131
			(stop)          ;;
134
			(stop)          ;;
135
			(reload) if [ $sd = 1 -a netcontrol_running ]; then
136
					cd "$OLDPWD"
137
					./$0 stop
138
					./$0 start
139
					systemctl start NetworkManager.service
140
			         fi
141
				 exit 0 ;;
132
			(*)      exit 6 ;;
142
			(*)      exit 6 ;;
133
		esac
143
		esac
134
	elif [ ! -x "$NETWORKMANAGER_BIN" ] ; then
144
	elif [ ! -x "$NETWORKMANAGER_BIN" ] ; then
Lines 138-143 if [ "$NETWORKMANAGER" = yes ] ; then Link Here
138
	        	 "\n/etc/sysconfig/network/config:NetworkManager=no" \
148
	        	 "\n/etc/sysconfig/network/config:NetworkManager=no" \
139
		         "or install NetworkManager."
149
		         "or install NetworkManager."
140
	fi
150
	fi
151
else
152
	if [ $sd = 1 -a nm_running ]; then
153
		systemctl stop NetworkManager.service
154
	fi
141
fi
155
fi
142
156
143
check_firewall() {
157
check_firewall() {
144
- 

Return to bug 719214