Marcus Meissner
73faa804ea
- 40network: always start netroot in ifup.sh (bnc#881235) * Add: 0066-40network-always-start-netroot-in-ifup.sh.patch - 95fcoe: check() always returns 255 * Add: 0067-95fcoe-check-always-returns-255.patch - 95fcoe-uefi: Test for EFI firmware (bnc#882412) * Add: 0068-95fcoe-uefi-Test-for-EFI-firmware.patch - Rename patches to match git repository: * Old: more-fips-adjustments.patch * New: 0057-01fips-Include-some-more-hmacs.patch * Old: dracut-check-supported.patch * New: 0058-dracut-add-warning-when-including-unsupported-module.patch - Add 99suse module to git repository: * Remove: parse-suse-initrd.sh * Remove: module-setup-initrd.sh * Add: 0059-99suse-Add-SUSE-specific-initrd-parsing.patch - Add write-ifcfg-suse.sh to git repository: * Remove: write-ifcfg-suse.sh * Add: 0060-45ifcfg-Add-SUSE-specific-write-ifcfg-file.patch - Fixup error messages in write-ifcfg-suse.sh (bnc#881286) * Add: 0061-45ifcfg-Fixup-error-message-in-write-ifcfg-suse.patch - Add missing 'libgcc_s.so' library (bnc#881692): * Add: 0062-95iscsi-Install-libgcc_s-library.patch * Add: 0063-90multipath-Install-libgcc_s-library.patch - Install missing scsi_dh_alua module (bnc#871617) * Add: 0064-90kernel-modules-install-scsi_dh_alua.patch - 95iscsi: fixup bnx2i offload booting (bnc#855747) * Add: 0065-95iscsi-Fixup-bnx2i-offload-booting.patch Add: more-fips-adjustments.patch OBS-URL: https://build.opensuse.org/request/show/237520 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=160
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
|
|
|