From: Hannes Reinecke <hare@xxxxxxx> Whenever the IFS setting is modified it needs to be restored to its original value. Otherwise it'll lead to unexpected results. References: bnc#883770 Signed-off-by: Hannes Reinecke <hare@xxxxxxx> Signed-off-by: Thomas Renninger <trenn@xxxxxxx> --- modules.d/90kernel-modules/insmodpost.sh | 2 ++ modules.d/90kernel-modules/parse-kernel.sh | 4 ++++ modules.d/95iscsi/module-setup.sh | 6 ++++-- modules.d/98systemd/dracut-pre-udev.sh | 4 ++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/modules.d/90kernel-modules/insmodpost.sh b/modules.d/90kernel-modules/insmodpost.sh index 4362f0a..b4bcdd0 100755 --- a/modules.d/90kernel-modules/insmodpost.sh +++ b/modules.d/90kernel-modules/insmodpost.sh @@ -4,9 +4,11 @@ for modlist in $(getargs rd.driver.post -d rdinsmodpost=); do ( + OLDIFS="$IFS" IFS=, for m in $modlist; do modprobe $m done + IFS="$OLDIFS" ) done diff --git a/modules.d/90kernel-modules/parse-kernel.sh b/modules.d/90kernel-modules/parse-kernel.sh index cbe7c85..81f7131 100755 --- a/modules.d/90kernel-modules/parse-kernel.sh +++ b/modules.d/90kernel-modules/parse-kernel.sh @@ -11,10 +11,12 @@ fi for i in $(getargs rd.driver.pre -d rdloaddriver=); do ( + OLDIFS="$IFS" IFS=, for p in $i; do modprobe $p 2>&1 | vinfo done + IFS="$OLDIFS" ) done @@ -23,10 +25,12 @@ done for i in $(getargs rd.driver.blacklist -d rdblacklist=); do ( + OLDIFS="$IFS" IFS=, for p in $i; do echo "blacklist $p" >> $_modprobe_d/initramfsblacklist.conf done + IFS="$OLDIFS" ) done diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh index 9975e59..f551c49 100755 --- a/modules.d/95iscsi/module-setup.sh +++ b/modules.d/95iscsi/module-setup.sh @@ -29,16 +29,18 @@ check() { } get_ibft_mod() { - local ibft_mac=$1 + local ibft_mac=$1 IFS # Return the iSCSI offload module for a given MAC address iscsiadm -m iface | while read iface_name iface_desc ; do + OLDIFS="$IFS" IFS=$',' set -- $iface_desc + IFS="$OLDIFS" if [ "$ibft_mac" = "$2" ] ; then echo $1 return 0 fi - unset IFS + done } diff --git a/modules.d/98systemd/dracut-pre-udev.sh b/modules.d/98systemd/dracut-pre-udev.sh index ca13048..b2be0e0 100755 --- a/modules.d/98systemd/dracut-pre-udev.sh +++ b/modules.d/98systemd/dracut-pre-udev.sh @@ -24,10 +24,12 @@ fi for i in $(getargs rd.driver.pre -d rdloaddriver=); do ( + OLDIFS="$IFS" IFS=, for p in $i; do modprobe $p 2>&1 | vinfo done + IFS="$OLDIFS" ) done @@ -36,10 +38,12 @@ done for i in $(getargs rd.driver.blacklist -d rdblacklist=); do ( + OLDIFS="$IFS" IFS=, for p in $i; do echo "blacklist $p" >> $_modprobe_d/initramfsblacklist.conf done + IFS="$OLDIFS" ) done -- 1.8.5.2 -- To unsubscribe from this list: send the line "unsubscribe initramfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html