From caac6ebf35cdd009b9e9eea9276dcf225fffa9ae Mon Sep 17 00:00:00 2001 From: Teresa Ho Date: Mon, 30 Sep 2019 08:26:19 -0400 Subject: [PATCH] Fix missing IP of alias interface The ifup-aliases script assumes that the IPv4 address is always defined. If the configuration is only for IPv6, the script would generate an error and not process the IPv6 address of the interface. This commit is to bring up the IPv6 interface even if the IPv4 address is not defined. Partial-Bug: 1834234 Change-Id: Ib0c4cbc7ec19cc0c0c485e4ad63c380aa8a49a4c Signed-off-by: Teresa Ho --- base/initscripts/centos/build_srpm.data | 2 +- .../centos/meta_patches/PATCH_ORDER | 1 + .../added-ifup-alias-check-ipaddr.patch | 32 +++++++++++++++++++ .../patches/ifup-alias-check-ipaddr.patch | 25 +++++++++++++++ 4 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 base/initscripts/centos/meta_patches/added-ifup-alias-check-ipaddr.patch create mode 100644 base/initscripts/centos/patches/ifup-alias-check-ipaddr.patch diff --git a/base/initscripts/centos/build_srpm.data b/base/initscripts/centos/build_srpm.data index c1f01e470..bc01e8b57 100644 --- a/base/initscripts/centos/build_srpm.data +++ b/base/initscripts/centos/build_srpm.data @@ -1 +1 @@ -TIS_PATCH_VER=18 +TIS_PATCH_VER=19 diff --git a/base/initscripts/centos/meta_patches/PATCH_ORDER b/base/initscripts/centos/meta_patches/PATCH_ORDER index 21f2afba1..e9baa496a 100644 --- a/base/initscripts/centos/meta_patches/PATCH_ORDER +++ b/base/initscripts/centos/meta_patches/PATCH_ORDER @@ -3,3 +3,4 @@ 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 +added-ifup-alias-check-ipaddr.patch diff --git a/base/initscripts/centos/meta_patches/added-ifup-alias-check-ipaddr.patch b/base/initscripts/centos/meta_patches/added-ifup-alias-check-ipaddr.patch new file mode 100644 index 000000000..777bb439b --- /dev/null +++ b/base/initscripts/centos/meta_patches/added-ifup-alias-check-ipaddr.patch @@ -0,0 +1,32 @@ +From 7f65521a9cee14ecd136f4caf44409b2acc86bdd Mon Sep 17 00:00:00 2001 +From: Teresa Ho +Date: Wed, 25 Sep 2019 16:19:26 -0400 +Subject: [PATCH 1/1] Added ifup-alias-check-ipaddr.patch + +--- + SPECS/initscripts.spec | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec +index fc7115c..9309d03 100644 +--- a/SPECS/initscripts.spec ++++ b/SPECS/initscripts.spec +@@ -49,6 +49,7 @@ 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 ++Patch14: ifup-alias-check-ipaddr.patch + + %description + The initscripts package contains basic system scripts used +@@ -82,6 +83,7 @@ Currently, this consists of various memory checking code. + %patch11 -p1 + %patch12 -p1 + %patch13 -p1 ++%patch14 -p1 + + %build + make +-- +1.8.3.1 + diff --git a/base/initscripts/centos/patches/ifup-alias-check-ipaddr.patch b/base/initscripts/centos/patches/ifup-alias-check-ipaddr.patch new file mode 100644 index 000000000..edac24bb1 --- /dev/null +++ b/base/initscripts/centos/patches/ifup-alias-check-ipaddr.patch @@ -0,0 +1,25 @@ +From a45766732beaa475d48907824666e501bacc69db Mon Sep 17 00:00:00 2001 +From: Teresa Ho +Date: Wed, 25 Sep 2019 15:56:36 -0400 +Subject: [PATCH 1/1] Patch14: ifup-alias-check-ipaddr + +--- + sysconfig/network-scripts/ifup-aliases | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases +index 9086763..40454ed 100755 +--- a/sysconfig/network-scripts/ifup-aliases ++++ b/sysconfig/network-scripts/ifup-aliases +@@ -175,7 +175,7 @@ function new_interface () + ipseen_${IPGLOP}=$FILE; devseen_${DEVNUM}=$FILE; + "; + +- if [ -n "$ipseen" ]; then ++ if [ -n "$IPADDR" -a -n "$ipseen" ]; then + net_log $"error in $FILE: already seen ipaddr $IPADDR in $ipseen" + return 1 + fi +-- +1.8.3.1 +