]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
network-manager: fix getting of ifname from the sysfs path
authorLubomir Rintel <lkundrak@v3.sk>
Wed, 30 Oct 2019 18:25:51 +0000 (19:25 +0100)
committerLukáš Nykrýn <lnykryn@redhat.com>
Tue, 5 Nov 2019 13:18:01 +0000 (14:18 +0100)
commit 5e0f8c8a4ced ('network-manager: remove useless use of basename')
somewhat carelessly didn't take into account that $_i has a slash at
the end which made the result of the ## substitution be just an empty
string.

The slash was put to the end of /sys/class/net/*/ to make sure we're only
iterating directories, but it's not strictly necessary. In an unlikely case
something else than a directory appears in /sys/class/net/, we'll already deal
with it gracefully. Remove it.

This fixes the TEST-30-ISCSI test.

modules.d/35network-manager/nm-run.sh

index a539d5b2cc12a0592545b549560e3b0d9f06e5d6..b33e099225ff6b66cccf5312c41bbbbeb5be66a0 100755 (executable)
@@ -6,7 +6,7 @@ else
     /usr/sbin/NetworkManager --configure-and-quit=initrd --no-daemon
 fi
 
-for _i in /sys/class/net/*/
+for _i in /sys/class/net/*
 do
     state=/run/NetworkManager/devices/$(cat $_i/ifindex)
     grep -q connection-uuid= $state 2>/dev/null || continue