From: Jackie Huang <jackie.huang@windriver.com>
Date: Thu, 18 Jun 2020 02:04:25 +0000 (+0800)
Subject: stx-metal: add setting for debain style networking in kickstart files
X-Git-Tag: cherry~32
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=f25bd8686cbd4ca9ac7d5baac36e0e1feb9187bd;p=pti%2Frtp.git

stx-metal: add setting for debain style networking in kickstart files

Yocto uses debain style for networking, so add corresponding settings
in kickstart files to fix network configuration.

Issue-ID: INF-166
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I3b1632ea7cd34315410b2398e17ccdbcd10517e0
---

diff --git a/meta-stx/recipes-core/stx-metal/files/0012-kickstarts-add-setting-for-debain-style-networking.patch b/meta-stx/recipes-core/stx-metal/files/0012-kickstarts-add-setting-for-debain-style-networking.patch
new file mode 100644
index 0000000..b76a1f4
--- /dev/null
+++ b/meta-stx/recipes-core/stx-metal/files/0012-kickstarts-add-setting-for-debain-style-networking.patch
@@ -0,0 +1,48 @@
+From 45298bf5951677433417eb1befc990ba7a70301a Mon Sep 17 00:00:00 2001
+From: Jackie Huang <jackie.huang@windriver.com>
+Date: Thu, 18 Jun 2020 09:53:00 +0800
+Subject: [PATCH] kickstarts: add setting for debain style networking
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ bsp-files/kickstarts/post_net_common.cfg         | 6 ++++++
+ bsp-files/kickstarts/post_pxeboot_controller.cfg | 6 ++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/bsp-files/kickstarts/post_net_common.cfg b/bsp-files/kickstarts/post_net_common.cfg
+index 8b854ff..46cdeeb 100755
+--- a/bsp-files/kickstarts/post_net_common.cfg
++++ b/bsp-files/kickstarts/post_net_common.cfg
+@@ -75,6 +75,12 @@ IPV6_AUTOCONF=no
+ LINKDELAY=20
+ EOF
+ 
++    # For Debian style networking settings
++    cat << EOF >> /etc/network/interfaces
++auto $mgmt_dev
++iface $mgmt_dev inet dhcp
++EOF
++
+ else
+ 
+     # Check whether to use inet or inet6
+diff --git a/bsp-files/kickstarts/post_pxeboot_controller.cfg b/bsp-files/kickstarts/post_pxeboot_controller.cfg
+index 54f7046..2b29a64 100644
+--- a/bsp-files/kickstarts/post_pxeboot_controller.cfg
++++ b/bsp-files/kickstarts/post_pxeboot_controller.cfg
+@@ -64,6 +64,12 @@ ONBOOT=yes
+ IPV6_AUTOCONF=no
+ EOF
+ 
++# For Debian style networking settings
++cat << EOF >> /etc/network/interfaces
++auto $mgmt_dev
++iface $mgmt_dev inet dhcp
++EOF
++
+ %end
+ 
+ %post --erroronfail
+-- 
+2.7.4
+
diff --git a/meta-stx/recipes-core/stx-metal/stx-metal.bb b/meta-stx/recipes-core/stx-metal/stx-metal.bb
index 0d69c97..a2708f6 100644
--- a/meta-stx/recipes-core/stx-metal/stx-metal.bb
+++ b/meta-stx/recipes-core/stx-metal/stx-metal.bb
@@ -49,6 +49,7 @@ SRC_URI = "git://opendev.org/starlingx/metal.git;protocol=${PROTOCOL};rev=${SRCR
 	file://0009-pmon_send_pulse.patch \
 	file://0010-libamon-add-shared-option.patch \
 	file://0011-kickstarts-adjustment-fnd-fixes-or-poky-stx.patch \
+	file://0012-kickstarts-add-setting-for-debain-style-networking.patch \
 	"
 
 inherit setuptools systemd