f057153bdc
In [1] it was decided to hardcode the NIC naming scheme to v238. Testing on more labs showed inconsistencies CentOS vs Debian on current hardcoded scheme. Switching to a custom scheme, which will allow more customization to be implemented in systemd. Patch 0011 was renamed to fix a typo. 0011-Debian-Harcode-net.naming-scheme-in-CONFIG_CMDLINE.patch -> 0011-Debian-Hardcode-net.naming-scheme-in-CONFIG_CMDLINE.patch Tests on AIO-SX: PASS: new parameter is picked up [1]: https://review.opendev.org/c/starlingx/kernel/+/841369 Depends-On: https://review.opendev.org/c/starlingx/kernel/+/841369 Depends-On: https://review.opendev.org/c/starlingx/integ/+/842337 Story: 2009964 Task: 45402 Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com> Change-Id: Idffff795d11f18c0c44da5d696484a0d7cd3cb2c
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From 8d2b2a2cd694d77872b28cbbd03d2647ef43c394 Mon Sep 17 00:00:00 2001
|
|
From: Dan Voiculeasa <dan.voiculeasa@windriver.com>
|
|
Date: Tue, 10 May 2022 12:21:32 +0300
|
|
Subject: [PATCH 11/11] Debian: Hardcode net.naming-scheme in CONFIG_CMDLINE
|
|
|
|
Between CentOS systemd v219 and Debian systemd v247 some changes for
|
|
determining NIC naming were introduced. Something called Predictable
|
|
Names is used[1]. When booting Debian we will see interfaces using a
|
|
different predictable name, which requires to be handled at an upper
|
|
level.
|
|
|
|
Try to keep differences to a minimum, to minimize upgrades impact.
|
|
Hardcode kernel parameter here to keep the effort contained.
|
|
|
|
On Debian we use systemd 247.
|
|
Use scheme v238, the oldest known scheme[2] to systemd 247.
|
|
|
|
There will be future work to handle the new naming scheme.
|
|
|
|
[1]: https://wiki.debian.org/NetworkInterfaceNames
|
|
[2]: https://github.com/systemd/systemd/blob/v247/src/
|
|
shared/netif-naming-scheme.c#L8
|
|
|
|
Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com>
|
|
---
|
|
debian/config/amd64/none/config | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/debian/config/amd64/none/config b/debian/config/amd64/none/config
|
|
index 5d75b7523..f8babc0c3 100644
|
|
--- a/debian/config/amd64/none/config
|
|
+++ b/debian/config/amd64/none/config
|
|
@@ -466,7 +466,8 @@ CONFIG_HOTPLUG_CPU=y
|
|
CONFIG_LEGACY_VSYSCALL_EMULATE=y
|
|
# CONFIG_LEGACY_VSYSCALL_XONLY is not set
|
|
# CONFIG_LEGACY_VSYSCALL_NONE is not set
|
|
-# CONFIG_CMDLINE_BOOL is not set
|
|
+CONFIG_CMDLINE_BOOL=y
|
|
+CONFIG_CMDLINE="net.naming-scheme=vSTX7_0"
|
|
CONFIG_MODIFY_LDT_SYSCALL=y
|
|
CONFIG_HAVE_LIVEPATCH=y
|
|
CONFIG_LIVEPATCH=y
|
|
--
|
|
2.36.1
|
|
|