Attachment 445952 Details for Bug 712300

[patch] don't start NM under systemd

0001-Do-not-handle-NetworkManager-if-running-under-system.patch (text/plain), 1.32 KB, created by Frederic Crozat on 2011-08-16 11:59:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Crozat

Created: 2011-08-16 11:59:43 UTC

Size: 1.32 KB

patch

obsolete

>From b53cab083de6baafb6fd61186d164dc2a71cfcf7 Mon Sep 17 00:00:00 2001
>From: Frederic Crozat <fcrozat@suse.com>
>Date: Fri, 12 Aug 2011 16:03:48 +0200
>Subject: [PATCH] Do not handle NetworkManager if running under systemd.
>
>NetworkManager should be using its own .service when used under
>systemd.
>---
> scripts/network |   11 ++++++++++-
> 1 files changed, 10 insertions(+), 1 deletions(-)
>
>diff --git a/scripts/network b/scripts/network
>index 5d8dc52..434dd66 100755
>--- a/scripts/network
>+++ b/scripts/network
>@@ -102,6 +102,13 @@ test -f scripts/functions.common \
>    || exit $R_INTERNAL
> 
> 
>+systemd_running () {
>+# We simply test whether systemd cgroup hierarchy is mounted
>+	/bin/mountpoint -q /sys/fs/cgroup/systemd
>+	return $?
>+}
>+
>+
> ######################################################################
> # Start NetworkManager if wanted
> #
>@@ -110,9 +117,11 @@ test -f scripts/functions.common \
> # because they are also used in ifup
> #
> if [ "$NETWORKMANAGER" = yes ] ; then
>-	if [ "$FS_FILTER" = "localfs" ] ; then
>+	if [ "$FS_FILTER" = "localfs" -o systemd_running ] ; then
> 		# NetworkManager is not supported without remotefs
> 		# and will be started later via network-remotefs.
>+		# NetworkManager should be started with its own .service
>+		# under systemd
> 		case $ACTION in
> 			(status) exit 3 ;;
> 			(start)  exit 0 ;;
>-- 
>1.7.3.4
>

Actions: View | Diff

Attachments on bug 712300: 445865 | 445866 | 445920 | 445921 | 445952