Merge "Scope parameter in ifup-aliases network script"
This commit is contained in:
commit
bd98266efd
|
@ -1 +1 @@
|
||||||
TIS_PATCH_VER=17
|
TIS_PATCH_VER=18
|
||||||
|
|
|
@ -2,3 +2,4 @@ spec-include-TiS-changes.patch
|
||||||
stop-creating-shared-dirs.patch
|
stop-creating-shared-dirs.patch
|
||||||
fix-build-failures-due-to-unwanted-sgid.patch
|
fix-build-failures-due-to-unwanted-sgid.patch
|
||||||
0001-Update-package-versioning-for-TIS-format.patch
|
0001-Update-package-versioning-for-TIS-format.patch
|
||||||
|
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
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue