Attachment 935415 Details for Bug 1136843 – [PATCH] core: don't generate a connection for unmanaged devices

[patch] [PATCH] core: don't generate a connection for unmanaged devices

0001-core-don-t-generate-a-connection-for-unmanaged-devic.patch (text/plain), 4.21 KB, created by Jirka Klimes on 2014-09-08 16:34:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jirka Klimes

Created: 2014-09-08 16:34:02 UTC

Size: 4.21 KB

patch

obsolete

>From 70a03ec20bb9e2fe3c31999c725eee5300856d7b Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
>Date: Mon, 8 Sep 2014 18:21:06 +0200
>Subject: [PATCH] core: don't generate a connection for unmanaged devices (rh
> #1136843)
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Resolves: #1136843
>
>Signed-off-by: JiÅÃ KlimeÅ¡ <jklimes@redhat.com>
>---
> ...36843-no-connection-for-unmanaged-devices.patch | 50 ++++++++++++++++++++++
> NetworkManager.spec                                |  7 ++-
> 2 files changed, 56 insertions(+), 1 deletion(-)
> create mode 100644 0035-rh1136843-no-connection-for-unmanaged-devices.patch
>
>diff --git a/0035-rh1136843-no-connection-for-unmanaged-devices.patch b/0035-rh1136843-no-connection-for-unmanaged-devices.patch
>new file mode 100644
>index 0000000..5b976f1
>--- /dev/null
>+++ b/0035-rh1136843-no-connection-for-unmanaged-devices.patch
>@@ -0,0 +1,50 @@
>+From 194b14e39899e8f3a73b1a151ed5384ecbf80149 Mon Sep 17 00:00:00 2001
>+From: Mikhail Efremov <sem altlinux org>
>+Date: Mon, 31 Mar 2014 20:29:05 +0400
>+Subject: [PATCH] core: don't generate a connection for unmanaged devices
>+MIME-Version: 1.0
>+Content-Type: text/plain; charset=UTF-8
>+Content-Transfer-Encoding: 8bit
>+
>+
>+Signed-off-by: JiÅÃ KlimeÅ¡ <jklimes@redhat.com>
>+---
>+ src/nm-manager.c | 9 ++++++---
>+ 1 file changed, 6 insertions(+), 3 deletions(-)
>+
>+diff --git a/src/nm-manager.c b/src/nm-manager.c
>+index 9d08b89..9300050 100644
>+--- a/src/nm-manager.c
>++++ b/src/nm-manager.c
>+@@ -1751,6 +1751,7 @@ add_device (NMManager *self, NMDevice *device, gboolean generate_con)
>+ 	char *path;
>+ 	static guint32 devcount = 0;
>+ 	const GSList *unmanaged_specs;
>++	gboolean unmanaged = FALSE;
>+ 	NMConnection *connection = NULL;
>+ 	gboolean enabled = FALSE;
>+ 	RfKillType rtype;
>+@@ -1847,15 +1848,17 @@ add_device (NMManager *self, NMDevice *device, gboolean generate_con)
>+ 	nm_log_info (LOGD_CORE, "(%s): exported as %s", iface, path);
>+ 	g_free (path);
>+ 
>++	unmanaged_specs = nm_settings_get_unmanaged_specs (priv->settings);
>++	unmanaged = nm_device_spec_match_list (device, unmanaged_specs);
>++
>+ 	/* Don't generate a connection e.g. for devices NM just created, or
>+ 	 * for the loopback */
>+-	if (generate_con)
>++	if (generate_con && !unmanaged)
>+ 		connection = get_existing_connection (self, device);
>+ 
>+ 	/* Start the device if it's supposed to be managed */
>+-	unmanaged_specs = nm_settings_get_unmanaged_specs (priv->settings);
>+ 	if (   !manager_sleeping (self)
>+-	    && !nm_device_spec_match_list (device, unmanaged_specs)) {
>++	    && !unmanaged) {
>+ 		nm_device_set_manager_managed (device,
>+ 		                               TRUE,
>+ 		                               connection ? NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED :
>+-- 
>+1.7.11.7
>+
>diff --git a/NetworkManager.spec b/NetworkManager.spec
>index a8b0e84..7122e7e 100644
>--- a/NetworkManager.spec
>+++ b/NetworkManager.spec
>@@ -28,7 +28,7 @@ Name: NetworkManager
> Summary: Network connection manager and user applications
> Epoch: 1
> Version: %{realversion}
>-Release: 33%{snapshot}%{?git_sha}%{?dist}
>+Release: 34%{snapshot}%{?git_sha}%{?dist}
> Group: System Environment/Base
> License: GPLv2+
> URL: http://www.gnome.org/projects/NetworkManager/
>@@ -72,6 +72,7 @@ Patch31: 0031-rh1094296-nmcli-secondaries.patch
> Patch32: 0032-rh1034150-delete-sw-device.patch
> Patch33: 0033-rh1007365-nmcli-readline.patch
> Patch34: 0034-rh990480-ibft-vlan.patch
>+Patch35: 0035-rh1136843-no-connection-for-unmanaged-devices.patch
> 
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
>@@ -257,6 +258,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
> %patch32 -p1 -b .0032-rh1034150-delete-sw-device.orig
> %patch33 -p1 -b .0033-rh1007365-nmcli-readline.orig
> %patch34 -p1 -b .0034-rh990480-ibft-vlan.orig
>+%patch35 -p1 -b .0035-rh1136843-no-connection-for-unmanaged-devices.orig
> 
> %build
> 
>@@ -480,6 +482,9 @@ fi
> %endif
> 
> %changelog
>+* Mon Sep  8 2014 JiÅÃ KlimeÅ¡ <jklimes@redhat.com> - 1:0.9.9.1-34.git20140326
>+- core: don't generate a connection for unmanaged devices (rh #1136843)
>+
> * Fri Sep  5 2014 JiÅÃ KlimeÅ¡ <jklimes@redhat.com> - 1:0.9.9.1-33.git20140326
> - cli: fix nmcli connection add (rh #1138303)
> 
>-- 
>1.7.11.7
>

Actions: View | Diff

Attachments on bug 1136843: 934065 | 935415