starlingx/meta-starlingx
Code Issues Proposed changes

Merge "stx-metal: add vlan setting for debain style networking in kickstart"

Browse Source
This commit is contained in:
Zuul 2020-12-03 21:14:11 +00:00 committed by Gerrit Code Review
commit 9764731203
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
meta-stx-flock/stx-metal/files/kickstarts-add-vlan-setting-for-debain-style-network.patch Normal file
View File

@ -0,0 +1,43 @@
From 97228a9287bec2049767d175f97226d90b4be943 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Sun, 22 Nov 2020 22:00:58 +0800
Subject: [PATCH] kickstarts: add vlan setting for debain style networking
Yocto uses debain style for networking, the previous patch
kickstarts-add-setting-for-debain-style-networking.patch
has fixed the non-vlan scenario but not for vlan scenario,
so add vlan settings as well.
Upstream-Status: Inappropriate [poky-stx specific]
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
bsp-files/kickstarts/post_net_common.cfg | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/bsp-files/kickstarts/post_net_common.cfg b/bsp-files/kickstarts/post_net_common.cfg
index 46cdeeb..c000348 100755
--- a/bsp-files/kickstarts/post_net_common.cfg
+++ b/bsp-files/kickstarts/post_net_common.cfg
@@ -135,6 +135,18 @@ VLAN=yes
LINKDELAY=20
EOF
+ # For Debian style networking settings
+ cat << EOF >> /etc/network/interfaces
+auto $mgmt_dev vlan$mgmt_vlan
+
+iface $mgmt_dev inet dhcp
+
+iface vlan$mgmt_vlan inet dhcp
+ vlan-raw-device $mgmt_dev
+ pre-up /sbin/modprobe -q 8021q
+EOF
+
+
# Reject DHCPOFFER from DHCP server that doesn't send
# wrs-install-uuid option
echo "require wrs-install-uuid;" >>/etc/dhcp/dhclient.conf
--
2.7.4

1
meta-stx-flock/stx-metal/platform-kickstarts.bb
View File

@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://kickstart/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd5
SRC_URI += " \
file://kickstarts-adjustment-and-fixes-or-poky-stx.patch;striplevel=2 \
file://kickstarts-add-setting-for-debain-style-networking.patch;striplevel=2 \
file://kickstarts-add-vlan-setting-for-debain-style-network.patch;striplevel=2 \
"
PACKAGES += " \