aboutsummaryrefslogtreecommitdiffstats
path: root/network-scripts/ifup-eth
diff options
context:
space:
mode:
authorJan Macku <jamacku@redhat.com>2020-07-24 13:46:14 +0200
committerGitHub <noreply@github.com>2020-07-24 13:46:14 +0200
commitd137d6097a43687f98c642f172c48b94652ba067 (patch)
tree9492f6825be1d5a8da2da1d431c7eeac0c38f21a /network-scripts/ifup-eth
parent0adee81ab33b5fc10a2e8ec893a7188d66bea6ef (diff)
downloadinitscripts-d137d6097a43687f98c642f172c48b94652ba067.tar
initscripts-d137d6097a43687f98c642f172c48b94652ba067.tar.gz
initscripts-d137d6097a43687f98c642f172c48b94652ba067.tar.bz2
initscripts-d137d6097a43687f98c642f172c48b94652ba067.tar.xz
initscripts-d137d6097a43687f98c642f172c48b94652ba067.zip
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)
Diffstat (limited to 'network-scripts/ifup-eth')
-rwxr-xr-xnetwork-scripts/ifup-eth4
1 files changed, 2 insertions, 2 deletions
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%%=*};