2e0abbdaf2
- FCOE fix bsc#982588 * Add 0212-fcoe_reorder_init_path.patch - Port missing SLES patches * Add 0197-95iscsi-Do-not-require-network-for-qla4xxx-flash-ses.patch * Add 0198-95iscsi-set-rd.iscsi.firmware-for-qla4xxx-sessions.patch * Remove 0194-95iscsi-Do-not-require-network-for-qla4xxx-flash-ses.patch * Remove 0195-95iscsi-set-rd.iscsi.firmware-for-qla4xxx-sessions.patch - Rewrite patch: * Add 0302-Revert-90multipath-add-hostonly-multipath.conf-in-ca.patch * Remove 0001-multipath_revert_mpathconf_binary_use.patch - Update 0403-95lunmask-Add-module-to-handle-LUN-masking.patch to match upstream kernel submission (FATE#319786) - Add IFS restoring where it has been lost due to mainline merging (bsc#977117) *Add 0500-Reset-IFS-variable.patch - Make sure to install collect binary (bsc#976466) * Add: 0188-95dasd_rules-Install-collect-udev-helper-binary.patch - Remove version from requires on subpackage - Add a split provide because of the package split for SLE12 SP1 to SP2 upgrade * 0001-multipath_revert_mpathconf_binary_use.patch (fate#320499) * 0170-iscsi-skip-ibft-invalid-dhcp.patch (bsc#953361) * 0160-s390-update_active_devices_initrd.patch (bsc#939101) * 0161-95zfcp_rules-simplified-rd.zfcp-commandline-for-NPIV.patch (bsc#964456) * 0190-replace-iscsistart-with-systemd-service-files.patch (fate#319024) * 0191-static_network_setup_return_zero.patch (bsc#919179) OBS-URL: https://build.opensuse.org/request/show/400457 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=258
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From 7104ea8c873ef89c9aacdd12a542bc71fc738aaa 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 100644
|
|
--- 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'"
|
|
--
|
|
2.6.6
|
|
|