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=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=020b31291744a2b56e1f1330ee6d67ea1ed0686e;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;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
deleted file mode 100644
index 020b312..0000000
--- a/meta-starlingx/meta-stx-flock/stx-metal/files/kickstarts-add-vlan-setting-for-debain-style-network.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
-