X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-flock%2Fstx-metal%2Ffiles%2Fkickstarts-add-vlan-setting-for-debain-style-network.patch;fp=meta-starlingx%2Fmeta-stx-flock%2Fstx-metal%2Ffiles%2Fkickstarts-add-vlan-setting-for-debain-style-network.patch;h=020b31291744a2b56e1f1330ee6d67ea1ed0686e;hb=551deff875a8af3f863c8bf963ca74ee2e27281f;hp=0000000000000000000000000000000000000000;hpb=e681fea95463940f62b7a3e2a4621d1c0c8aa607;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-flock/stx-metal/files/kickstarts-add-vlan-setting-for-debain-style-network.patch b/meta-starlingx/meta-stx-flock/stx-metal/files/kickstarts-add-vlan-setting-for-debain-style-network.patch
new file mode 100644
index 0000000..020b312
--- /dev/null
+++ b/meta-starlingx/meta-stx-flock/stx-metal/files/kickstarts-add-vlan-setting-for-debain-style-network.patch
@@ -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
+