Attachment 831577 Details for Bug 1036701 – patch to initscripts git

[patch] patch to initscripts git

0001-network-functions-update-ifup-ifdown-NetworkManager-.patch (text/plain), 1.53 KB, created by Dan Winship on 2013-12-02 13:48:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Winship

Created: 2013-12-02 13:48:25 UTC

Size: 1.53 KB

patch

obsolete

>From c697381641e7a5fba8e8b6cb1550d5aa6fdefaf3 Mon Sep 17 00:00:00 2001
>From: Dan Winship <danw@gnome.org>
>Date: Mon, 18 Nov 2013 10:48:19 -0500
>Subject: [PATCH] network-functions: update ifup/ifdown NetworkManager
> interaction
>
>In its default configuration, NM 0.9.9 no longer automatically reloads
>ifcfg files when they change, so we need to reload them manually, so
>that, eg, creating/editing an ifcfg file and then using "ifup" on it
>has the expected behavior.
>
>Also, change the _use_nm detection so that we always ask NM if it
>knows about a connection, rather than assuming that NM knows about
>every connection that has a UUID and isn't NM_CONTROLLED=no. (In
>particular, if someone changes a NetworkManager-created Ethernet
>connection from "TYPE=Ethernet" to "TYPE=OVSPort", then ifup needs to
>activate/deactivate it itself)
>---
> sysconfig/network-scripts/network-functions | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
>index c699fc0..7617544 100644
>--- a/sysconfig/network-scripts/network-functions
>+++ b/sysconfig/network-scripts/network-functions
>@@ -170,9 +170,10 @@ source_config ()
>     else
> 	ISALIAS=no
>     fi
>-    ! is_false $NM_CONTROLLED && is_nm_running && _use_nm=true
>-    if [ -z "$UUID" -a "$_use_nm" = "true" ]; then
>+    if ! is_false $NM_CONTROLLED && is_nm_running; then
>+	nmcli con load "/etc/sysconfig/network-scripts/$CONFIG"
> 	UUID=$(get_uuid_by_config $CONFIG)
>+	[ -n "$UUID" ] && _use_nm=true
>     fi
> }
> 
>-- 
>1.8.4.2
>

Actions: View | Diff

Attachments on bug 1036701: 831577