41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
|
From 8bbd0f21e9c85898219bdf0f8dc3d31ccfaaf477 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hannes Reinecke <hare@suse.de>
|
||
|
|
Date: Wed, 4 Jun 2014 13:12:31 +0200
|
||
|
|
Subject: 45ifcfg: Fixup error message in write-ifcfg-suse
|
||
|
|
|
||
|
|
A fix was missing in write-ifcfg-suse.sh, cause dracut to issue
|
||
|
|
a warning for a non-existent file.
|
||
|
|
|
||
|
|
References: bnc#881286
|
||
|
|
|
||
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
||
|
|
---
|
||
|
|
modules.d/45ifcfg/write-ifcfg-suse.sh | 4 +++-
|
||
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/modules.d/45ifcfg/write-ifcfg-suse.sh b/modules.d/45ifcfg/write-ifcfg-suse.sh
|
||
|
|
index 4b6350f..e9b4d10 100755
|
||
|
|
--- a/modules.d/45ifcfg/write-ifcfg-suse.sh
|
||
|
|
+++ b/modules.d/45ifcfg/write-ifcfg-suse.sh
|
||
|
|
@@ -32,6 +32,7 @@ for netup in /tmp/net.*.did-setup ; do
|
||
|
|
|
||
|
|
netif=${netup%%.did-setup}
|
||
|
|
netif=${netif##*/net.}
|
||
|
|
+ strglobin "$netif" ":*:*:*:*:" && continue
|
||
|
|
[ -e /tmp/ifcfg/ifcfg-$netif ] && continue
|
||
|
|
unset bridge
|
||
|
|
unset bond
|
||
|
|
@@ -58,7 +59,8 @@ for netup in /tmp/net.*.did-setup ; do
|
||
|
|
if [ "$netif" = "$vlanname" ]; then
|
||
|
|
vlan=yes
|
||
|
|
fi
|
||
|
|
- cat /sys/class/net/$netif/address > /tmp/net.$netif.hwaddr
|
||
|
|
+ [ -e /sys/class/net/$netif/address ] && \
|
||
|
|
+ cat /sys/class/net/$netif/address > /tmp/net.$netif.hwaddr
|
||
|
|
{
|
||
|
|
echo "# Generated by dracut initrd"
|
||
|
|
echo "NAME='$netif'"
|
||
|
|
--
|
||
|
|
1.8.4.5
|
||
|
|
|