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

import initscripts-10.00.6-1.el8_2.2

Browse Source
This commit is contained in:
CentOS Sources 2020-09-08 04:38:26 -04:00 committed by Andrew Lukoshko
parent 7873d68b59
commit 39683981d8
2 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
SOURCES/001-Add-optional-dev-keyword.patch Normal file
View File

@ -0,0 +1,56 @@
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

6
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}.1
Release: 1%{?dist}.2
License: GPLv2
@ -66,6 +66,7 @@ Obsoletes: %{name} < 9.82-2
# ---------------- 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:
# ------------------
@ -345,6 +346,9 @@ fi
# =============================================================================
%changelog
* Fri Jul 24 2020 Jan Macku <jamacku@redhat.com> - 10.00.6-1.el8_2.2
- 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