Attachment 450703 Details for Bug 630434

[patch] Alternative patch to "/etc/init.d/boot.open-iscsi".

open-iscsi-2.0.871-0.29.1-boot.open-iscsi.patch (text/plain), 1.47 KB, created by Dennis Olsson on 2011-09-14 13:01:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dennis Olsson

Created: 2011-09-14 13:01:56 UTC

Size: 1.47 KB

patch

obsolete

>diff -Naur open-iscsi-2.0.871-0.29.1/etc/init.d/boot.open-iscsi open-iscsi-2.0.871-0.29.1-fixed/etc/init.d/boot.open-iscsi
>--- open-iscsi-2.0.871-0.29.1/etc/init.d/boot.open-iscsi	2011-07-25 13:03:01.000000000 +0000
>+++ open-iscsi-2.0.871-0.29.1-fixed/etc/init.d/boot.open-iscsi	2011-09-14 12:26:45.931843639 +0000
>@@ -31,11 +31,13 @@
> #
> iscsi_mark_root_nodes()
> {
>+    rc_failed 5
>     $ISCSIADM -m session 2> /dev/null | while read t num i target ; do
> 	ip=${i%%:*}
> 	STARTUP=`$ISCSIADM -m node -p $ip -T $target 2> /dev/null | grep "node.conn\[0\].startup" | cut -d' ' -f3`
> 	if [ "$STARTUP" -a "$STARTUP" != "onboot" ] ; then
> 	    $ISCSIADM -m node -p $ip -T $target -o update -n node.conn[0].startup -v onboot
>+	    rc_failed 0
> 	fi
>     done
> }
>@@ -43,7 +45,7 @@
> # Reset status of this service
> rc_reset
> 
>-# We only need to start this for root on iSCSI
>+# We only need to run this, if the iSCSI stack has already been loaded
> if ! grep -q iscsi_tcp /proc/modules ; then
>     rc_failed 6
>     rc_exit
>@@ -51,10 +53,15 @@
> 
> case "$1" in
>     start)
>-	echo -n "Starting iSCSI initiator for the root device: "
>-	startproc $DAEMON $ARGS
>-	rc_status -v
>+	if ! checkproc $DAEMON
>+	then
>+	    echo -n "Starting iSCSI initiator for the root device: "
>+	    startproc $DAEMON $ARGS
>+	    rc_status -v
>+	fi
>+	echo -n "Marking iSCSI targets as needed iSCSI devices at boot up time: "
> 	iscsi_mark_root_nodes
>+	rc_status -v
> 	;;
>     stop|restart|reload)
> 	rc_failed 0
>@@ -74,4 +81,3 @@
> 	;;
> esac
> rc_exit
>-

Actions: View | Diff

Attachments on bug 630434: 386537 | 386539 | 450674 | 450695 | 450697 | 450703 | 485398 | 485399 | 485400