starlingx/kernel
Code Issues Proposed changes

Merge "debian: Change hardcoded NIC naming scheme"

Browse Source
This commit is contained in:
Zuul 2022-05-23 01:12:53 +00:00 committed by Gerrit Code Review
commit 3a5210054e
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel-rt/debian/deb_patches/0011-Debian-Harcode-net.naming-scheme-in-CONFIG_CMDLINE.patch → kernel-rt/debian/deb_patches/0011-Debian-Hardcode-net.naming-scheme-in-CONFIG_CMDLINE.patch
View File

@ -1,7 +1,7 @@
From af3e406bccbcad7b7fce66201db9d431f48cf36b Mon Sep 17 00:00:00 2001 From febffb4e6227aa946db476634ebe39b22d4ee804 Mon Sep 17 00:00:00 2001
From: Dan Voiculeasa <dan.voiculeasa@windriver.com> From: Dan Voiculeasa <dan.voiculeasa@windriver.com>
Date: Tue, 10 May 2022 12:21:32 +0300 Date: Tue, 10 May 2022 12:21:32 +0300
Subject: [PATCH 11/11] Debian: Harcode net.naming-scheme in CONFIG_CMDLINE Subject: [PATCH 11/11] Debian: Hardcode net.naming-scheme in CONFIG_CMDLINE
Between CentOS systemd v219 and Debian systemd v247 some changes for Between CentOS systemd v219 and Debian systemd v247 some changes for
determining NIC naming were introduced. Something called Predictable determining NIC naming were introduced. Something called Predictable
@ -27,7 +27,7 @@ Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com>
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/config/amd64/none/config b/debian/config/amd64/none/config diff --git a/debian/config/amd64/none/config b/debian/config/amd64/none/config
index bb72bbd94..2e1910137 100644 index bb72bbd94..0d66ceff0 100644
--- a/debian/config/amd64/none/config --- a/debian/config/amd64/none/config
+++ b/debian/config/amd64/none/config +++ b/debian/config/amd64/none/config
@@ -463,7 +463,8 @@ CONFIG_HOTPLUG_CPU=y @@ -463,7 +463,8 @@ CONFIG_HOTPLUG_CPU=y
@ -36,7 +36,7 @@ index bb72bbd94..2e1910137 100644
# CONFIG_LEGACY_VSYSCALL_NONE is not set # CONFIG_LEGACY_VSYSCALL_NONE is not set
-# CONFIG_CMDLINE_BOOL is not set -# CONFIG_CMDLINE_BOOL is not set
+CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="net.naming-scheme=v238" +CONFIG_CMDLINE="net.naming-scheme=vSTX7_0"
CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_MODIFY_LDT_SYSCALL=y
CONFIG_HAVE_LIVEPATCH=y CONFIG_HAVE_LIVEPATCH=y
CONFIG_LIVEPATCH=y CONFIG_LIVEPATCH=y

2
kernel-rt/debian/deb_patches/series
View File

@ -8,4 +8,4 @@
0008-config-set-configs-needed-for-secure-boot.patch 0008-config-set-configs-needed-for-secure-boot.patch
0009-Drop-Android-patches.patch 0009-Drop-Android-patches.patch
0010-Debian-Disable-CONFIG_BNXT.patch 0010-Debian-Disable-CONFIG_BNXT.patch
0011-Debian-Harcode-net.naming-scheme-in-CONFIG_CMDLINE.patch 0011-Debian-Hardcode-net.naming-scheme-in-CONFIG_CMDLINE.patch

10
kernel-std/debian/deb_patches/0011-Debian-Harcode-net.naming-scheme-in-CONFIG_CMDLINE.patch → kernel-std/debian/deb_patches/0011-Debian-Hardcode-net.naming-scheme-in-CONFIG_CMDLINE.patch
View File

@ -1,7 +1,7 @@
From 028f1a594fc4a815398949a6d12f9d299373f6ec Mon Sep 17 00:00:00 2001 From 8d2b2a2cd694d77872b28cbbd03d2647ef43c394 Mon Sep 17 00:00:00 2001
From: Dan Voiculeasa <dan.voiculeasa@windriver.com> From: Dan Voiculeasa <dan.voiculeasa@windriver.com>
Date: Tue, 10 May 2022 12:21:32 +0300 Date: Tue, 10 May 2022 12:21:32 +0300
Subject: [PATCH 11/11] Debian: Harcode net.naming-scheme in CONFIG_CMDLINE Subject: [PATCH 11/11] Debian: Hardcode net.naming-scheme in CONFIG_CMDLINE
Between CentOS systemd v219 and Debian systemd v247 some changes for Between CentOS systemd v219 and Debian systemd v247 some changes for
determining NIC naming were introduced. Something called Predictable determining NIC naming were introduced. Something called Predictable
@ -27,7 +27,7 @@ Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com>
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/config/amd64/none/config b/debian/config/amd64/none/config diff --git a/debian/config/amd64/none/config b/debian/config/amd64/none/config
index 5d75b7523..fd01a2a69 100644 index 5d75b7523..f8babc0c3 100644
--- a/debian/config/amd64/none/config --- a/debian/config/amd64/none/config
+++ b/debian/config/amd64/none/config +++ b/debian/config/amd64/none/config
@@ -466,7 +466,8 @@ CONFIG_HOTPLUG_CPU=y @@ -466,7 +466,8 @@ CONFIG_HOTPLUG_CPU=y
@ -36,10 +36,10 @@ index 5d75b7523..fd01a2a69 100644
# CONFIG_LEGACY_VSYSCALL_NONE is not set # CONFIG_LEGACY_VSYSCALL_NONE is not set
-# CONFIG_CMDLINE_BOOL is not set -# CONFIG_CMDLINE_BOOL is not set
+CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="net.naming-scheme=v238" +CONFIG_CMDLINE="net.naming-scheme=vSTX7_0"
CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_MODIFY_LDT_SYSCALL=y
CONFIG_HAVE_LIVEPATCH=y CONFIG_HAVE_LIVEPATCH=y
CONFIG_LIVEPATCH=y CONFIG_LIVEPATCH=y
-- --
2.30.0 2.36.1

2
kernel-std/debian/deb_patches/series
View File

@ -8,4 +8,4 @@
0008-config-set-configs-needed-for-secure-boot.patch 0008-config-set-configs-needed-for-secure-boot.patch
0009-Drop-Android-patches.patch 0009-Drop-Android-patches.patch
0010-Debian-Disable-CONFIG_BNXT.patch 0010-Debian-Disable-CONFIG_BNXT.patch
0011-Debian-Harcode-net.naming-scheme-in-CONFIG_CMDLINE.patch 0011-Debian-Hardcode-net.naming-scheme-in-CONFIG_CMDLINE.patch