You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
1.7 KiB
46 lines
1.7 KiB
6 years ago
|
From 12aa314819f2b1067442e8a7aa5d3f36301b7f47 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hannes Reinecke <hare@suse.de>
|
||
|
|
Date: Thu, 25 Feb 2016 20:58:12 +0800
|
||
|
|
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 181da3c7..64c9c1d1 100755
|
||
|
|
--- a/modules.d/95iscsi/module-setup.sh
|
||
|
|
+++ b/modules.d/95iscsi/module-setup.sh
|
||
|
|
@@ -75,12 +75,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() {
|
||
|
|
@@ -129,6 +123,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"
|