From 54e28d79b9f67b8be349ae97f92dde2c6c118e11 Mon Sep 17 00:00:00 2001

From: Hannes Reinecke <hare@suse.de>

Date: Thu, 11 Dec 2014 15:46:02 +0100

Subject: [PATCH] 95iscsi: More empty cmdline fixes

This fixes up some 95iscsi/module-setup.sh which might print out empty

commandline files.

Signed-off-by: Hannes Reinecke <hare@suse.de>

Signed-off-by: Thomas Renninger <trenn@suse.de>

---

 modules.d/95iscsi/module-setup.sh | 13 +++++++------

 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh

index d30e64f..29bba82 100755

--- a/modules.d/95iscsi/module-setup.sh

+++ b/modules.d/95iscsi/module-setup.sh

@@ -76,12 +76,6 @@ depends() {

 installkernel() {

     local _arch=$(uname -m)

-    # Detect iBFT and perform mandatory steps

-    if [[ $hostonly_cmdline == "yes" ]] ; then

-        install_ibft > "${initdir}/etc/cmdline.d/95iscsi.conf"

-        echo >> "${initdir}/etc/cmdline.d/95iscsi.conf"

-    fi

-

     instmods bnx2i qla4xxx cxgb3i cxgb4i be2iscsi

     hostonly="" instmods iscsi_tcp iscsi_ibft crc32c iscsi_boot_sysfs

     iscsi_module_filter() {

@@ -131,6 +125,13 @@ install() {

     inst_multiple umount iscsistart hostname iscsi-iname

     inst_multiple -o iscsiuio

     inst_libdir_file 'libgcc_s.so*'

+

+    # Detect iBFT and perform mandatory steps

+    if [[ $hostonly_cmdline == "yes" ]] ; then

+        local _ibftconf=$(install_ibft)

+        [[ $_ibftconf ]] && printf "%s\n" "$_ibftconf" >> "${initdir}/etc/cmdline.d/95iscsi.conf"

+    fi

+

     inst_hook cmdline 90 "$moddir/parse-iscsiroot.sh"

     inst_hook cleanup 90 "$moddir/cleanup-iscsi.sh"

     inst "$moddir/iscsiroot.sh" "/sbin/iscsiroot"