From ddfdd21a0aa7dbdea5faa2780f34ad8ccf41ef19 Mon Sep 17 00:00:00 2001 From: Charles Short Date: Tue, 26 Jul 2022 14:01:03 -0400 Subject: [PATCH] debian: Setup 00check-network-cable Enable the 00check-network-cable script when ifupdown-extras package is installed in the standard /etc/network/if-pre-up.d directory. The script makes sure that the network cable test script gets installed into the right place so that we check for network link is available before the network starts. This is a non-standard starlingx specific change. Story: 2009221 Task: 45758 Test Plan PASS Build sysinv package PASS Build ISO PASS Run bootstap/unlock PASS Check for /etc/network/if-pre-up.d/00check-network-cable script Signed-off-by: Charles Short Change-Id: Ic4c845a7e2fd8d8ecb377a3d469b1e4cc10b3abc --- ...ck-network-cable-in-the-correct-spot.patch | 29 +++++++++++++++++++ .../ifupdown-extra/debian/deb_patches/series | 3 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 networking/ifupdown-extra/debian/deb_patches/0002-Install-00check-network-cable-in-the-correct-spot.patch diff --git a/networking/ifupdown-extra/debian/deb_patches/0002-Install-00check-network-cable-in-the-correct-spot.patch b/networking/ifupdown-extra/debian/deb_patches/0002-Install-00check-network-cable-in-the-correct-spot.patch new file mode 100644 index 000000000..00059eaf7 --- /dev/null +++ b/networking/ifupdown-extra/debian/deb_patches/0002-Install-00check-network-cable-in-the-correct-spot.patch @@ -0,0 +1,29 @@ +From 3623134b09353d8d43575cb2ab8ed240a268202f Mon Sep 17 00:00:00 2001 +From: Charles Short +Date: Tue, 2 Aug 2022 08:25:36 -0400 +Subject: [PATCH] Install 00check-network-cable in the correct spot + +Update debian/rules to install the 00check-network-cable in the +correct spot. + +Signed-off-by: Charles Short +--- + debian/rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/debian/rules b/debian/rules +index 32ae425..6dee5a7 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -18,7 +18,7 @@ override_dh_install: + install -m644 debian/network-routes $(CURDIR)/debian/ifupdown-extra/etc/network/routes + install -m644 debian/network-test-default $(CURDIR)/debian/ifupdown-extra/etc/default/network-test + # Network scripts for ifupdown +- install -m755 if-up-scripts/check-network-cable $(CURDIR)/debian/ifupdown-extra/etc/network/if-up.d/00check-network-cable ++ install -m755 if-up-scripts/check-network-cable $(CURDIR)/debian/ifupdown-extra/etc/network/if-pre-up.d/00check-network-cable + install -m755 if-up-scripts/check-duplicate-ip $(CURDIR)/debian/ifupdown-extra/etc/network/if-up.d/10check-duplicate-ip + install -m755 if-up-scripts/check-duplicate-ip6 $(CURDIR)/debian/ifupdown-extra/etc/network/if-up.d/10check-duplicate-ip6 + install -m755 if-up-scripts/static-routes $(CURDIR)/debian/ifupdown-extra/etc/network/if-up.d/20static-routes +-- +2.25.1 + diff --git a/networking/ifupdown-extra/debian/deb_patches/series b/networking/ifupdown-extra/debian/deb_patches/series index a613dcd78..4b195659f 100644 --- a/networking/ifupdown-extra/debian/deb_patches/series +++ b/networking/ifupdown-extra/debian/deb_patches/series @@ -1 +1,2 @@ -0001-Accept-netmask-or-prefix-length-on-etc-network-route.patch \ No newline at end of file +0001-Accept-netmask-or-prefix-length-on-etc-network-route.patch +0002-Install-00check-network-cable-in-the-correct-spot.patch