From b0f2a8f808f7103bf4a53d34d2bad703e3dcb711 Mon Sep 17 00:00:00 2001
From: Teresa Ho <teresa.ho@windriver.com>
Date: Wed, 19 Dec 2018 12:23:01 -0500
Subject: [PATCH] Scope parameter in ifup-aliases network script

The management interface uses the loopback interface for AIO-SX.
For the containerized deployment, the cluster-host interface shares
the same interface with management by default. It would need to be
scoped to host instead of global as it is an alias to the loopback
interface.
The scope parameter is added for the ifup-aliases to set scope
to host if the parent device is the loopback interface.

Story: 2004273
Task: 28590

Change-Id: Iee62c825ed1650b6cfdb0d4e5eb43b4a635e819a
Signed-off-by: Teresa Ho <teresa.ho@windriver.com>
---
 base/initscripts/centos/build_srpm.data       |  2 +-
 .../centos/meta_patches/PATCH_ORDER           |  1 +
 .../meta_patches/ifup-alias-scope.patch       | 34 +++++++++++++++++++
 .../centos/patches/ifup-alias-scope.patch     | 32 +++++++++++++++++
 4 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 base/initscripts/centos/meta_patches/ifup-alias-scope.patch
 create mode 100644 base/initscripts/centos/patches/ifup-alias-scope.patch

diff --git a/base/initscripts/centos/build_srpm.data b/base/initscripts/centos/build_srpm.data
index 922ab8629..c1f01e470 100644
--- a/base/initscripts/centos/build_srpm.data
+++ b/base/initscripts/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=17
+TIS_PATCH_VER=18
diff --git a/base/initscripts/centos/meta_patches/PATCH_ORDER b/base/initscripts/centos/meta_patches/PATCH_ORDER
index 3ff270c11..21f2afba1 100644
--- a/base/initscripts/centos/meta_patches/PATCH_ORDER
+++ b/base/initscripts/centos/meta_patches/PATCH_ORDER
@@ -2,3 +2,4 @@ spec-include-TiS-changes.patch
 stop-creating-shared-dirs.patch
 fix-build-failures-due-to-unwanted-sgid.patch
 0001-Update-package-versioning-for-TIS-format.patch
+ifup-alias-scope.patch
diff --git a/base/initscripts/centos/meta_patches/ifup-alias-scope.patch b/base/initscripts/centos/meta_patches/ifup-alias-scope.patch
new file mode 100644
index 000000000..654329fa5
--- /dev/null
+++ b/base/initscripts/centos/meta_patches/ifup-alias-scope.patch
@@ -0,0 +1,34 @@
+From ad85db9465da885a5f186db7f23655a3735a43c5 Mon Sep 17 00:00:00 2001
+From: Teresa Ho <teresa.ho@windriver.com>
+Date: Fri, 4 Jan 2019 10:49:27 -0500
+Subject: [PATCH 1/1] Added ifup-alias-scope.patch
+
+---
+ SPECS/initscripts.spec | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
+index 6e9fc13..bff1e12 100644
+--- a/SPECS/initscripts.spec
++++ b/SPECS/initscripts.spec
+@@ -48,6 +48,7 @@ Patch9: sysconfig-unsafe-usage-of-linkdelay-variable.patch
+ Patch10: ipv6-static-route-support.patch
+ Patch11: ifup-eth-stop-waiting-if-link-is-up.patch
+ Patch12: run-dhclient-as-daemon-for-ipv6.patch
++Patch13: ifup-alias-scope.patch
+ 
+ %description
+ The initscripts package contains basic system scripts used
+@@ -80,7 +81,8 @@ Currently, this consists of various memory checking code.
+ %patch10 -p1
+ %patch11 -p1
+ %patch12 -p1
+- 
++%patch13 -p1
++
+ %build
+ make
+ 
+-- 
+1.8.3.1
+
diff --git a/base/initscripts/centos/patches/ifup-alias-scope.patch b/base/initscripts/centos/patches/ifup-alias-scope.patch
new file mode 100644
index 000000000..e05acda5f
--- /dev/null
+++ b/base/initscripts/centos/patches/ifup-alias-scope.patch
@@ -0,0 +1,32 @@
+From 59e30a344df4b661f30c0a5c629dbd13e9d88e8f Mon Sep 17 00:00:00 2001
+From: Teresa Ho <teresa.ho@windriver.com>
+Date: Mon, 17 Dec 2018 17:47:18 -0500
+Subject: [PATCH 1/1] WRS: Patch13: ifup-alias-scope.patch
+
+---
+ sysconfig/network-scripts/ifup-aliases | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases
+index 52d43ea..9086763 100755
+--- a/sysconfig/network-scripts/ifup-aliases
++++ b/sysconfig/network-scripts/ifup-aliases
+@@ -277,8 +277,14 @@ function new_interface ()
+             fi
+         fi
+ 
++        if [ "${parent_device}" = "lo" ]; then
++            SCOPE="scope host"
++        else
++            SCOPE=${SCOPE:-}
++        fi
++
+         /sbin/ip addr add ${IPADDR}/${PREFIX} brd ${BROADCAST} \
+-            dev ${parent_device} label ${DEVICE}
++            dev ${parent_device} ${SCOPE} label ${DEVICE}
+ 
+         # update ARP cache of neighboring computers:
+         if ! is_false "${ARPUPDATE}" && [ "${REALDEVICE}" != "lo" ]; then
+-- 
+1.8.3.1
+