Attachment 452395 Details for Bug 719214

[patch] correct patch for network script

0001-Handle-reload-restart-when-changing-between-ifup-and.patch (text/plain), 1.68 KB, created by Frederic Crozat on 2011-09-22 07:38:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Crozat

Created: 2011-09-22 07:38:57 UTC

Size: 1.68 KB

patch

obsolete

>From 29200bc7d37b447436056cb94b4f9a80e2332129 Mon Sep 17 00:00:00 2001
>From: Frederic Crozat <fcrozat@suse.com>
>Date: Wed, 21 Sep 2011 18:10:50 +0200
>Subject: [PATCH] Handle reload / restart when changing between ifup and NM with systemd
>
>Need to restart NM ourself, using systemd (bnc#719214)
>---
> scripts/network |   18 ++++++++++++++++--
> 1 files changed, 16 insertions(+), 2 deletions(-)
>
>diff --git a/scripts/network b/scripts/network
>index 5219b75..1ba5285 100755
>--- a/scripts/network
>+++ b/scripts/network
>@@ -118,8 +118,8 @@ systemd_running () {
> # /etc/sysconfig/network/scripts/functions
> # because they are also used in ifup
> #
>+systemd_running ; sd=$?
> if [ "$NETWORKMANAGER" = yes ] ; then
>-	systemd_running ; sd=$?
> 	if [ "$FS_FILTER" = "localfs" -o $sd = 1 ] ; then
> 		# NetworkManager is not supported without remotefs
> 		# and will be started later via network-remotefs.
>@@ -127,8 +127,18 @@ if [ "$NETWORKMANAGER" = yes ] ; then
> 		# under systemd
> 		case $ACTION in
> 			(status) exit 3 ;;
>-			(start)  exit 0 ;;
>+			(start)  if [ $sd = 1 ]; then
>+					systemctl start NetworkManager.service
>+				 fi
>+				 exit 0 ;;
> 			(stop)          ;;
>+			(reload) if [ $sd = 1 -a netcontrol_running ]; then
>+					cd "$OLDPWD"
>+					./$0 stop
>+					./$0 start
>+					systemctl start NetworkManager.service
>+			         fi
>+				 exit 0 ;;
> 			(*)      exit 6 ;;
> 		esac
> 	elif [ ! -x "$NETWORKMANAGER_BIN" ] ; then
>@@ -138,6 +148,10 @@ if [ "$NETWORKMANAGER" = yes ] ; then
> 	        	 "\n/etc/sysconfig/network/config:NetworkManager=no" \
> 		         "or install NetworkManager."
> 	fi
>+else
>+	if [ $sd = 1 -a nm_running ]; then
>+		systemctl stop NetworkManager.service
>+	fi
> fi
> 
> check_firewall() {
>-- 
>1.7.3.4
>

Actions: View | Diff

Attachments on bug 719214: 452281 | 452395 | 452559 | 452560