Attachment 485400 Details for Bug 630434

[patch] Patch for /etc/init.d/open-iscsi and boot.open-iscsi

open-iscsi-boot-only-start-if-not-running.diff (text/plain), 3.29 KB, created by Lee Duncan on 2012-04-10 01:09:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lee Duncan

Created: 2012-04-10 01:09:18 UTC

Size: 3.29 KB

patch

obsolete

>Index: b/etc/initd/boot.suse
>===================================================================
>--- a/etc/initd/boot.suse	2012-03-31 19:47:20.000000000 -0700
>+++ b/etc/initd/boot.suse	2012-03-31 19:55:41.000000000 -0700
>@@ -9,11 +9,11 @@
> # Required-Stop:
> # Should-Stop:       $null
> # Default-Start:     B
>-# Default-Stop:      
>+# Default-Stop:
> # Short-Description: iSCSI initiator daemon root-fs support
> # Description:       Starts the iSCSI initiator daemon if the
> #                    root-filesystem is on an iSCSI device
>-#               
>+#
> ### END INIT INFO
> 
> ISCSIADM=/sbin/iscsiadm
>@@ -35,19 +35,24 @@ iscsi_load_iscsiuio()
>     TRANSPORT=`$ISCSIADM -m session 2> /dev/null | grep "bnx2i"`
>     if [ "$TRANSPORT" ] ; then
> 	echo -n "Launch iscsiuio "
>-        startproc $ISCSIUIO
>+	startproc $ISCSIUIO
>+	rc_status -v
>     fi
> }
> 
> iscsi_mark_root_nodes()
> {
>+    echo -n "Marking iSCSI targets needed at boot time: "
>+    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
>+    rc_status -v
> }
> 
> # Reset status of this service
>@@ -61,10 +66,12 @@ fi
> 
> case "$1" in
>     start)
>-	echo -n "Starting iSCSI initiator for the root device: "
> 	iscsi_load_iscsiuio
>-	startproc $DAEMON $ARGS
>-	rc_status -v
>+	if ! checkproc $DAEMON ; then
>+	    echo -n "Starting iSCSI initiator for boot-time devices: "
>+	    startproc $DAEMON $ARGS
>+	    rc_status -v
>+	fi
> 	iscsi_mark_root_nodes
> 	;;
>     stop|restart|reload)
>Index: b/etc/initd/initd.suse
>===================================================================
>--- a/etc/initd/initd.suse	2012-03-31 19:47:20.000000000 -0700
>+++ b/etc/initd/initd.suse	2011-12-13 13:14:39.000000000 -0800
>@@ -9,7 +9,7 @@
> # Required-Stop:     $network
> # Should-Stop:       multipathd
> # Default-Start:     3 5
>-# Default-Stop:      
>+# Default-Stop:
> # Short-Description: iSCSI initiator daemon
> # Description:       The iSCSI initator is used to create and
> #                    manage iSCSI connections to a iSCSI Target.
>@@ -231,7 +231,7 @@ iscsi_check_if_mounted()
>     local dev=$1
>     local d m t o x p
> 
>-    cat /proc/mounts | sed -ne '/^\/dev\/.*/p' | while read d m t o x; do 
>+    cat /proc/mounts | sed -ne '/^\/dev\/.*/p' | while read d m t o x; do
> 	if [ -L "$d" ] ; then
> 	    d=$(readlink -f $d)
> 	fi
>@@ -258,10 +258,10 @@ iscsi_check_if_mounted()
> 
> #
> # Unwind block device stack
>-# 
>+#
> # Stops unwinding if either no more 'holders'
> # are found or if a device is mounted
>-# 
>+#
> # Unmounts top-level device and deconfigures
> # all devices down the stack
> #
>@@ -388,6 +388,7 @@ iscsi_list_all_nodes()
> {
>     # Check for active sessions
>     if $ISCSIADM -m session > /dev/null; then
>+	echo "No active connections."
> 	return 0
>     fi
>     echo "Active connections:"
>@@ -399,9 +400,9 @@ iscsi_list_all_nodes()
> 
> case "$1" in
>     start)
>-        echo -n "Loading iscsi modules: "
>-        iscsi_load_transport_modules
>-        rc_status -v
>+	echo -n "Loading iscsi modules: "
>+	iscsi_load_transport_modules
>+	rc_status -v
> 	if checkproc $DAEMON ; then
> 	    RETVAL=0
> 	else

Actions: View | Diff

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