import initscripts-10.00.9-1.el8
This commit is contained in:
CentOS Sources
parent
39683981d8
commit
99ec60418b
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/initscripts-10.00.6.tar.gz
|
||||
SOURCES/initscripts-10.00.9.tar.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
8b9b2a8c9ec45039da9795b25ab8e314b129c916 SOURCES/initscripts-10.00.6.tar.gz
|
||||
5c0337270fe24918465bf268e0bce8c6850b229a SOURCES/initscripts-10.00.9.tar.gz
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
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
|
||||
@ -1,56 +0,0 @@
|
||||
From d137d6097a43687f98c642f172c48b94652ba067 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Macku <jamacku@redhat.com>
|
||||
Date: Fri, 24 Jul 2020 13:46:14 +0200
|
||||
Subject: [PATCH 1/2] Add optional 'dev' keyword
|
||||
|
||||
Fix the problem when the device name could be interpreted as an iproute2 keyword.
|
||||
For example, for a bridge slave named "a" the iproute2 would treat
|
||||
the name as a prefix of keyword "address" and the network-scripts
|
||||
would fail to set the bridge master.
|
||||
|
||||
Resolves: rhbz #1859785
|
||||
|
||||
(cherry picked from commit 100ed46b483b50059b3be796bafaf7b8f2b99220)
|
||||
---
|
||||
network-scripts/ifup | 2 +-
|
||||
network-scripts/ifup-eth | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/network-scripts/ifup b/network-scripts/ifup
|
||||
index 69b0bd24..8d565800 100755
|
||||
--- a/network-scripts/ifup
|
||||
+++ b/network-scripts/ifup
|
||||
@@ -140,7 +140,7 @@ if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ] && [ -n "$DEVICE" ]; then
|
||||
exit 1
|
||||
}
|
||||
|
||||
- [ -n "${VLAN_EGRESS_PRIORITY_MAP}" ] && ip link set ${DEVICE} type vlan egress ${VLAN_EGRESS_PRIORITY_MAP}
|
||||
+ [ -n "${VLAN_EGRESS_PRIORITY_MAP}" ] && ip link set dev ${DEVICE} type vlan egress ${VLAN_EGRESS_PRIORITY_MAP}
|
||||
fi
|
||||
fi
|
||||
|
||||
diff --git a/network-scripts/ifup-eth b/network-scripts/ifup-eth
|
||||
index 1d6f18e7..cd898f63 100755
|
||||
--- a/network-scripts/ifup-eth
|
||||
+++ b/network-scripts/ifup-eth
|
||||
@@ -60,7 +60,7 @@ if [ "${TYPE}" = "Bridge" ]; then
|
||||
if [ ! -d /sys/class/net/${DEVICE}/bridge ]; then
|
||||
ip link add ${DEVICE} type bridge $bridge_opts || exit 1
|
||||
elif [ -n "${bridge_opts}" ]; then
|
||||
- ip link set ${DEVICE} type bridge $bridge_opts || exit 1
|
||||
+ ip link set dev ${DEVICE} type bridge $bridge_opts || exit 1
|
||||
fi
|
||||
unset bridge_opts
|
||||
|
||||
@@ -191,7 +191,7 @@ if [ -n "${BRIDGE}" ]; then
|
||||
/sbin/ip link set dev ${DEVICE} up
|
||||
ethtool_set
|
||||
[ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY}
|
||||
- ip link set ${DEVICE} master ${BRIDGE}
|
||||
+ ip link set dev ${DEVICE} master ${BRIDGE}
|
||||
# add the bits to setup driver parameters here
|
||||
for arg in $BRIDGING_OPTS ; do
|
||||
key=${arg%%=*};
|
||||
--
|
||||
2.25.4
|
||||
|
||||
@ -18,8 +18,8 @@ Requires: gawk \
|
||||
|
||||
Name: initscripts
|
||||
Summary: Basic support for legacy System V init scripts
|
||||
Version: 10.00.6
|
||||
Release: 1%{?dist}.2
|
||||
Version: 10.00.9
|
||||
Release: 1%{?dist}
|
||||
|
||||
License: GPLv2
|
||||
|
||||
@ -65,8 +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
|
||||
Patch001: 001-Add-optional-dev-keyword.patch
|
||||
|
||||
|
||||
# Downstream patches -- these should be always included when doing rebase:
|
||||
# ------------------
|
||||
@ -96,6 +95,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%shared_requirements
|
||||
|
||||
Requires: bc
|
||||
Requires: dbus
|
||||
Requires: gawk
|
||||
Requires: grep
|
||||
@ -346,11 +346,17 @@ fi
|
||||
# =============================================================================
|
||||
|
||||
%changelog
|
||||
* Fri Jul 24 2020 Jan Macku <jamacku@redhat.com> - 10.00.6-1.el8_2.2
|
||||
* Fri Jul 24 2020 Jan Macku <jamacku@redhat.com> - 10.00.9-1
|
||||
- Add optional 'dev' keyword
|
||||
|
||||
* 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 Jun 16 2020 Jan Macku <jamacku@redhat.com> - 10.00.8-1
|
||||
- rwtab: Add support for chrony
|
||||
- ifup-eth: Switch to bc utility, which supports floating point computations.
|
||||
- Replace grep -EL with subshell since -L changed behaviour
|
||||
|
||||
* Wed Apr 15 2020 Jan Macku <jamacku@redhat.com> - 10.00.7-1
|
||||
- Wait for scope link addresses as well as for scope global addresses
|
||||
- Remove deprecated option -m of pidof
|
||||
|
||||
* Tue Dec 10 2019 Jan Macku <jamacku@redhat.com> - 10.00.6-1
|
||||
- Fix service network stop cmd
|
||||
|
||||
Loading…
Reference in New Issue
Block a user