linuxrc: simplify iscsi setup code

12 years ago · 798c45d3da
parent 138b1f8492
commit 798c45d3da
2 changed files with 5 additions and 5 deletions
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@ -1065,6 +1065,10 @@ start_volumes() {
 }
 start_iscsi() {
 	if [ ! -e /usr/sbin/iscsistart ]; then
 		return 0  # disabled
 	fi
 	if [ ! -n "${ISCSI_NOIBFT}" ]
 	then
 		good_msg "Activating iSCSI via iBFT"
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@ -271,11 +271,7 @@ fi
 cd /
-# Start iSCSI
+start_iscsi
 if [ -e /usr/sbin/iscsistart ]
 then
 	start_iscsi
 fi
 # Setup btrfs, see bug 303529
 setup_btrfsctl