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

(-)a/scripts/network (-2 / +10 lines)
Lines 102-107 test -f scripts/functions.common \ Link Here
102
   || exit $R_INTERNAL
102
   || exit $R_INTERNAL
103
103
104
104
105
systemd_running () {
106
# We simply test whether systemd cgroup hierarchy is mounted
107
	/bin/mountpoint -q /sys/fs/cgroup/systemd
108
	return $?
109
}
110
111
105
######################################################################
112
######################################################################
106
# Start NetworkManager if wanted
113
# Start NetworkManager if wanted
107
#
114
#
Lines 110-118 test -f scripts/functions.common \ Link Here
110
# because they are also used in ifup
117
# because they are also used in ifup
111
#
118
#
112
if [ "$NETWORKMANAGER" = yes ] ; then
119
if [ "$NETWORKMANAGER" = yes ] ; then
113
	if [ "$FS_FILTER" = "localfs" ] ; then
120
	if [ "$FS_FILTER" = "localfs" -o systemd_running ] ; then
114
		# NetworkManager is not supported without remotefs
121
		# NetworkManager is not supported without remotefs
115
		# and will be started later via network-remotefs.
122
		# and will be started later via network-remotefs.
123
		# NetworkManager should be started with its own .service
124
		# under systemd
116
		case $ACTION in
125
		case $ACTION in
117
			(status) exit 3 ;;
126
			(status) exit 3 ;;
118
			(start)  exit 0 ;;
127
			(start)  exit 0 ;;
119
- 

Return to bug 712300