rpms/initscripts
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import initscripts-10.00.6-1.el8_2.1

Browse Source
This commit is contained in:
CentOS Sources 2020-06-09 17:56:06 -04:00 committed by Andrew Lukoshko
parent 4f362703c4
commit 7873d68b59
2 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
SOURCES/000-wait-for-DAD.patch Normal file
View File

@ -0,0 +1,43 @@
From 7b58642dc59c4c5ec7f29b3067a17f129ab08035 Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Wed, 11 Mar 2020 17:45:57 +0100
Subject: [PATCH] Wait for scope link addresses as well as for scope global
addresses
Fix issue when interface has assigned only local address in tentative
state and DHCPv6 isn't able to assign address to that interface.
With this patch network-scripts will wait until tentative state is gone (wait for DAD)
for all scopes including local one.
Resolves: #1809601
---
network-scripts/network-functions-ipv6 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/network-scripts/network-functions-ipv6 b/network-scripts/network-functions-ipv6
index b5b3e939..2f7b19b8 100644
--- a/network-scripts/network-functions-ipv6
+++ b/network-scripts/network-functions-ipv6
@@ -1058,7 +1058,7 @@ ipv6_wait_tentative() {
[ "$device" = lo ] && return 0
while [ ${countdown} -gt 0 ]; do
- ip_output="$(ip -6 addr show dev ${device} scope global tentative)"
+ ip_output="$(ip -6 addr show dev ${device} tentative)"
if [ -z "$ip_output" ]; then
return 0;
@@ -1073,11 +1073,11 @@ ipv6_wait_tentative() {
countdown=$(($countdown - 1))
done
- ip_output="$(ip -6 addr show dev ${device} scope global tentative)"
+ ip_output="$(ip -6 addr show dev ${device} tentative)"
if [ -n "$ip_output" ]; then
net_log $"Some IPv6 address(es) of ${device} remain still in 'tentative' state" warning $fn
- net_log $"Run 'ip -6 addr show dev ${device} scope global tentative' to see more" warning $fn
+ net_log $"Run 'ip -6 addr show dev ${device} tentative' to see more" warning $fn
fi
return 0

8
SPECS/initscripts.spec
View File

@ -19,7 +19,7 @@ Requires: gawk \
Name: initscripts
Summary: Basic support for legacy System V init scripts
Version: 10.00.6
Release: 1%{?dist}
Release: 1%{?dist}.1
License: GPLv2
@ -46,6 +46,7 @@ BuildRequires: glib2-devel
BuildRequires: pkgconfig
BuildRequires: popt-devel
BuildRequires: setup
BuildRequires: python3-devel
%{?systemd_requires}
BuildRequires: systemd
@ -64,7 +65,7 @@ Obsoletes: %{name} < 9.82-2
# Upstream patches -- official upstream patches released by upstream since the
# ---------------- last rebase that are necessary for any reason:
#Patch000: example000.patch
Patch000: 000-wait-for-DAD.patch
# Downstream patches -- these should be always included when doing rebase:
# ------------------
@ -344,6 +345,9 @@ fi
# =============================================================================
%changelog
* Thu Apr 09 2020 Jan Macku <jamacku@redhat.com> - 10.00.6-1.el8_2.1
- network-functions-ipv6: Wait for DAD in all scopes
* Tue Dec 10 2019 Jan Macku <jamacku@redhat.com> - 10.00.6-1
- Fix service network stop cmd
- Fix missing python3 during build phase