89f9350d9e
- Fix dmraid issue bnc#905746 A dracut_dmraid_use_udev.patch - Taken over from SLE12 A fips_add_aesni-intel.patch - Do not touch /run vs /var/run bnc#922676 D 0106-dracut-Enable-converting-of-directory-var-run-var-lo.patch - Update dracut to version 042 Remove these already included or unneeded patches: D dracut_v041_to_HEAD.patch D 0011-Correct-paths-for-openSUSE.patch D 0068-95fcoe-uefi-Test-for-EFI-firmware.patch D 0170-enable-logitech-hidpp.patch Adjust/refresh: M 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch M 0016-Add-new-s390x-specific-rule-files.patch M 0017-45ifcfg-use-distro-specific-scripts.patch M 0019-40network-Fix-race-condition-when-wait-for-networks.patch M 0020-00warpclock-Set-correct-timezone.patch M 0021-95dcssblk-Add-new-module-for-DCSS-block-devices.patch M 0048-40network-Only-enable-network-interfaces-if-explicit.patch M 0053-01fips-fixup-loading-issues.patch M 0056-81cio_ignore-handle-cio_ignore-commandline.patch M 0057-01fips-Include-some-more-hmacs.patch M 0058-dracut-add-warning-when-including-unsupported-module.patch M 0059-99suse-Add-SUSE-specific-initrd-parsing.patch M 0060-45ifcfg-Add-SUSE-specific-write-ifcfg-file.patch M 0061-45ifcfg-Fixup-error-message-in-write-ifcfg-suse.patch M 0066-40network-always-start-netroot-in-ifup.sh.patch M 0075-95dasd_rules-enable-parsing-of-rd.dasd-commandline-p.patch M 0076-Correctly-set-cio_ignore-for-dynamic-s390-rules.patch OBS-URL: https://build.opensuse.org/request/show/314510 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=219
38 lines
1.4 KiB
Diff
38 lines
1.4 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(-)
|
|
|
|
Index: dracut-042/modules.d/45ifcfg/write-ifcfg-suse.sh
|
|
===================================================================
|
|
--- dracut-042.orig/modules.d/45ifcfg/write-ifcfg-suse.sh 2015-06-24 18:02:09.389373610 +0200
|
|
+++ dracut-042/modules.d/45ifcfg/write-ifcfg-suse.sh 2015-06-24 18:02:09.677390007 +0200
|
|
@@ -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'"
|