|
 |
a9f26f |
From c7b21c88d27aace097ce9bc1fc36f4b742858737 Mon Sep 17 00:00:00 2001
|
|
|
a9f26f |
From: Pavel Valena <pvalena@redhat.com>
|
|
|
a9f26f |
Date: Mon, 22 Nov 2021 16:40:39 +0100
|
|
|
a9f26f |
Subject: [PATCH] fix(network): add errors and warnings when network interface
|
|
|
a9f26f |
does not exist
|
|
|
a9f26f |
|
|
|
a9f26f |
End with error, or show a warning when nonexistent device is specified for network setup like
|
|
|
a9f26f |
`ip=10.12.8.12::10.12.255.254:255.255.0.0:xk12:eth0:off`.
|
|
|
a9f26f |
|
|
|
a9f26f |
I've added the error only for `write-ifcfg.sh`, as I think no such setup should be written.
|
|
|
a9f26f |
|
|
|
a9f26f |
Resolves: #1712424
|
|
|
a9f26f |
---
|
|
|
a9f26f |
modules.d/35network-legacy/ifup.sh | 6 +++++-
|
|
|
a9f26f |
modules.d/35network-legacy/parse-ip-opts.sh | 5 +++++
|
|
|
a9f26f |
modules.d/45ifcfg/write-ifcfg.sh | 5 +++++
|
|
|
a9f26f |
3 files changed, 15 insertions(+), 1 deletion(-)
|
|
|
a9f26f |
|
|
|
a9f26f |
diff --git a/modules.d/35network-legacy/ifup.sh b/modules.d/35network-legacy/ifup.sh
|
|
|
a9f26f |
index bd560379..0e9a6928 100755
|
|
|
a9f26f |
--- a/modules.d/35network-legacy/ifup.sh
|
|
|
a9f26f |
+++ b/modules.d/35network-legacy/ifup.sh
|
|
|
a9f26f |
@@ -413,7 +413,11 @@ for p in $(getargs ip=); do
|
|
|
a9f26f |
|
|
|
a9f26f |
# If this option isn't directed at our interface, skip it
|
|
|
a9f26f |
if [ -n "$dev" ]; then
|
|
|
a9f26f |
- [ "$dev" != "$netif" ] && continue
|
|
|
a9f26f |
+ if [ "$dev" != "$netif" ]; then
|
|
|
a9f26f |
+ [ ! -e "/sys/class/net/$dev" ] \
|
|
|
a9f26f |
+ && warn "Network interface '$dev' does not exist!"
|
|
|
a9f26f |
+ continue
|
|
|
a9f26f |
+ fi
|
|
|
a9f26f |
else
|
|
|
a9f26f |
iface_is_enslaved "$netif" && continue
|
|
|
a9f26f |
fi
|
|
|
a9f26f |
diff --git a/modules.d/35network-legacy/parse-ip-opts.sh b/modules.d/35network-legacy/parse-ip-opts.sh
|
|
|
a9f26f |
index 10a2d19b..eea0988c 100755
|
|
|
a9f26f |
--- a/modules.d/35network-legacy/parse-ip-opts.sh
|
|
|
a9f26f |
+++ b/modules.d/35network-legacy/parse-ip-opts.sh
|
|
|
a9f26f |
@@ -96,6 +96,11 @@ for p in $(getargs ip=); do
|
|
|
a9f26f |
fi
|
|
|
a9f26f |
# IFACES list for later use
|
|
|
a9f26f |
IFACES="$IFACES $dev"
|
|
|
a9f26f |
+
|
|
|
a9f26f |
+ # Interface should exist
|
|
|
a9f26f |
+ if [ ! -e "/sys/class/net/$dev" ]; then
|
|
|
a9f26f |
+ warn "Network interface '$dev' does not exist"
|
|
|
a9f26f |
+ fi
|
|
|
a9f26f |
fi
|
|
|
a9f26f |
|
|
|
a9f26f |
# Do we need to check for specific options?
|
|
|
a9f26f |
diff --git a/modules.d/45ifcfg/write-ifcfg.sh b/modules.d/45ifcfg/write-ifcfg.sh
|
|
|
a9f26f |
index abd111fc..7e767f15 100755
|
|
|
a9f26f |
--- a/modules.d/45ifcfg/write-ifcfg.sh
|
|
|
a9f26f |
+++ b/modules.d/45ifcfg/write-ifcfg.sh
|
|
|
a9f26f |
@@ -100,6 +100,11 @@ interface_bind() {
|
|
|
a9f26f |
local _netif="$1"
|
|
|
a9f26f |
local _macaddr="$2"
|
|
|
a9f26f |
|
|
|
a9f26f |
+ if [ ! -e "/sys/class/net/$_netif" ]; then
|
|
|
a9f26f |
+ derror "Cannot find network interface '$_netif'!"
|
|
|
a9f26f |
+ return 1
|
|
|
a9f26f |
+ fi
|
|
|
a9f26f |
+
|
|
|
a9f26f |
# see, if we can bind it to some hw parms
|
|
|
a9f26f |
if hw_bind "$_netif" "$_macaddr"; then
|
|
|
a9f26f |
# only print out DEVICE, if it's user assigned
|
|
|
a9f26f |
|