File 0001-compat-suse-repair-dummy-interfaces-boo-12... of Package wicked

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-compat-suse-repair-dummy-interfaces-boo-1229555.patch of Package wicked (Revision e0f32b15a65a179c80eaa3493901454a)

Currently displaying revision e0f32b15a65a179c80eaa3493901454a , Show latest

From d8735359252d70ac44fa0359a78809a41d8f393a Mon Sep 17 00:00:00 2001
From: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
Date: Sat, 24 Aug 2024 05:46:37 +0200
Subject: [PATCH] compat-suse: repair dummy interfaces (boo#1229555)
Reference: boo#122955
Upstream: merged

Commit 98b4fb3359ebf48e2466338df2b89e263e0aa609 introduced changes
causing dummy interaces configured using "INTERFACETYPE=dummy"
or "DUMMY=yes" to presumably inadvertently no longer be recognized.
Restore functionality of these settings by only calling the new
pattern matching logic if a prior iftype lookup did not yield success.
This is needed to continue supporting configuration of dummy interfaces
not matching the predefined naming scheme.

The following constellations have been tested:
- "ifcfg-foo" file with "INTERFACETYPE=dummy"
- "ifcfg-foo" file with "DUMMY=yes"
- "ifcfg-dummy1" file without "INTERFACETYPE" or "DUMMY"

Fixes: 98b4fb3359eb ("compat-suse: fix dummy type detection from ifname")
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
---
 client/suse/compat-suse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/suse/compat-suse.c b/client/suse/compat-suse.c
index 1ed3e778..82ed3cfb 100644
--- a/client/suse/compat-suse.c
+++ b/client/suse/compat-suse.c
@@ -3787,7 +3787,7 @@ try_dummy(ni_suse_ifcfg_array_t *ifcfgs, ni_suse_ifcfg_t *ifcfg)
 		if (iftype && !ni_string_eq_nocase(iftype, "dummy"))
 			return 1;
 
-		if (dev->link.type != NI_IFTYPE_UNKNOWN || !maybe_dummy(dev->name))
+		if (dev->link.type != NI_IFTYPE_UNKNOWN || (!iftype && !maybe_dummy(dev->name)))
 			return 1;
 	} else {
 		if (!ni_sysconfig_get_boolean(sc, "DUMMY", &enabled) || !enabled)

Places

File 0001-compat-suse-repair-dummy-interfaces-boo-1229555.patch of Package wicked (Revision e0f32b15a65a179c80eaa3493901454a)

Places