Thomas Renninger
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
100 lines
3.3 KiB
Diff
100 lines
3.3 KiB
Diff
From bcfdc4522d2f04d0a1fd46d80a8ac7ff357b8bc5 Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Mon, 14 Jul 2014 10:22:31 +0200
|
|
Subject: Reset IFS variable
|
|
|
|
Setting and unsetting the IFS variable is tricky. To be on the
|
|
safe side we should always reset the IFS variable to its original
|
|
value after parsing.
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
modules.d/95dasd/parse-dasd.sh | 2 ++
|
|
modules.d/95zfcp/parse-zfcp.sh | 2 ++
|
|
3 files changed, 6 insertions(+)
|
|
|
|
Index: dracut-044/modules.d/95dasd/parse-dasd.sh
|
|
===================================================================
|
|
--- dracut-044.orig/modules.d/95dasd/parse-dasd.sh 2015-11-25 14:22:28.000000000 +0100
|
|
+++ dracut-044/modules.d/95dasd/parse-dasd.sh 2016-04-26 15:12:30.739569930 +0200
|
|
@@ -1,8 +1,10 @@
|
|
#!/bin/sh
|
|
for dasd_arg in $(getargs rd.dasd= -d rd_DASD= DASD=); do
|
|
(
|
|
+ local OLDIFS="$IFS"
|
|
IFS=","
|
|
set -- $dasd_arg
|
|
+ IFS="$OLDIFS"
|
|
echo "$@" | normalize_dasd_arg >> /etc/dasd.conf
|
|
)
|
|
done
|
|
Index: dracut-044/modules.d/95dasd_rules/parse-dasd.sh
|
|
===================================================================
|
|
--- dracut-044.orig/modules.d/95dasd_rules/parse-dasd.sh 2016-04-26 15:12:29.575504027 +0200
|
|
+++ dracut-044/modules.d/95dasd_rules/parse-dasd.sh 2016-04-26 15:16:13.780196465 +0200
|
|
@@ -59,8 +59,10 @@ for dasd_arg in $(getargs root=) $(getar
|
|
;;
|
|
esac
|
|
if [ -n "$ccw_arg" ] ; then
|
|
+ OLDIFS="$IFS"
|
|
IFS="-"
|
|
set -- $ccw_arg
|
|
+ IFS="$OLDIFS"
|
|
create_udev_rule $2
|
|
fi
|
|
)
|
|
@@ -68,9 +70,10 @@ done
|
|
|
|
for dasd_arg in $(getargs rd.dasd=); do
|
|
(
|
|
+ OLDIFS="$IFS"
|
|
IFS=","
|
|
set -- $dasd_arg
|
|
- unset IFS
|
|
+ IFS="$OLDIFS"
|
|
while (($# > 0)); do
|
|
case $1 in
|
|
autodetect|probeonly)
|
|
@@ -78,13 +81,14 @@ for dasd_arg in $(getargs rd.dasd=); do
|
|
;;
|
|
*-*)
|
|
range=$1
|
|
+ OLDIFS="$IFS"
|
|
IFS="-"
|
|
set -- $range
|
|
start=${1#0.0.}
|
|
shift
|
|
end=${1#0.0.}
|
|
shift
|
|
- unset IFS
|
|
+ IFS="$OLDIFS"
|
|
for dev in $(seq $(( 16#$start )) $(( 16#$end )) ) ; do
|
|
create_udev_rule $(printf "0.0.%04x" "$dev")
|
|
done
|
|
Index: dracut-044/modules.d/95zfcp_rules/parse-zfcp.sh
|
|
===================================================================
|
|
--- dracut-044.orig/modules.d/95zfcp_rules/parse-zfcp.sh 2016-04-26 15:12:30.051530977 +0200
|
|
+++ dracut-044/modules.d/95zfcp_rules/parse-zfcp.sh 2016-04-26 15:17:31.484595325 +0200
|
|
@@ -53,8 +53,10 @@ fi
|
|
|
|
for zfcp_arg in $(getargs rd.zfcp); do
|
|
(
|
|
+ OLDIFS="$IFS"
|
|
IFS=","
|
|
set $zfcp_arg
|
|
+ IFS="$OLDIFS"
|
|
create_udev_rule $1 $2 $3
|
|
)
|
|
done
|
|
@@ -70,8 +72,10 @@ for zfcp_arg in $(getargs root=) $(getar
|
|
;;
|
|
esac
|
|
if [ -n "$ccw_arg" ] ; then
|
|
+ OLDIFS="$IFS"
|
|
IFS="-"
|
|
set -- $ccw_arg
|
|
+ IFS="$OLDIFS"
|
|
_wwpn=${4%:*}
|
|
_lun=${4#*:}
|
|
create_udev_rule $2 $wwpn $lun
|