Skip to content

Commit 7938935

Browse files
pvalenajohannbg
authored andcommitted
fix(network): add errors and warnings when network interface does not exist
End with error, or show a warning when nonexistent device is specified for network setup like `ip=10.12.8.12::10.12.255.254:255.255.0.0:xk12:eth0:off`. I've added the error only for `write-ifcfg.sh`, as I think no such setup should be written. Resolves: #1712424
1 parent 5b18b06 commit 7938935

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

modules.d/35network-legacy/ifup.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,11 @@ for p in $(getargs ip=); do
446446

447447
# If this option isn't directed at our interface, skip it
448448
if [ -n "$dev" ]; then
449-
[ "$dev" != "$netif" ] && continue
449+
if [ "$dev" != "$netif" ]; then
450+
[ ! -e "/sys/class/net/$dev" ] \
451+
&& warn "Network interface '$dev' does not exist!"
452+
continue
453+
fi
450454
else
451455
iface_is_enslaved "$netif" && continue
452456
fi

modules.d/35network-legacy/parse-ip-opts.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,11 @@ for p in $(getargs ip=); do
9797
fi
9898
# IFACES list for later use
9999
IFACES="$IFACES $dev"
100+
101+
# Interface should exist
102+
if [ ! -e "/sys/class/net/$dev" ]; then
103+
warn "Network interface '$dev' does not exist"
104+
fi
100105
fi
101106

102107
# Do we need to check for specific options?

modules.d/45ifcfg/write-ifcfg.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ interface_bind() {
103103
local _netif="$1"
104104
local _macaddr="$2"
105105

106+
if [ ! -e "/sys/class/net/$_netif" ]; then
107+
derror "Cannot find network interface '$_netif'!"
108+
return 1
109+
fi
110+
106111
# see, if we can bind it to some hw parms
107112
if hw_bind "$_netif" "$_macaddr"; then
108113
# only print out DEVICE, if it's user assigned

0 commit comments

Comments
 (0)