From 74e0dafe095ae279a62abbd1211ccdfb2f6f4afece7361ec1f14b9aa89cf1fec Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 29 Aug 2008 00:59:20 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/open-iscsi?expand=0&rev=7

---
 open-iscsi-update-init-script | 37 ++++++++++++++++++++++-------------
 open-iscsi.changes            |  5 +++++
 open-iscsi.spec               | 15 +++++++++++---
 3 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/open-iscsi-update-init-script b/open-iscsi-update-init-script
index 67f4c6b..41a9094 100644
--- a/open-iscsi-update-init-script
+++ b/open-iscsi-update-init-script
@@ -1,8 +1,13 @@
-diff --git a/etc/initd/boot.suse b/etc/initd/boot.suse
-index df64e21..e4a54a6 100644
---- a/etc/initd/boot.suse
-+++ b/etc/initd/boot.suse
-@@ -10,8 +10,10 @@
+--- open-iscsi-2.0-870-rc1/etc/initd/boot.suse
++++ open-iscsi-2.0-870-rc1/etc/initd/boot.suse
+@@ -5,13 +5,15 @@
+ ### BEGIN INIT INFO
+ # Provides:          iscsiboot
+ # Required-Start:    boot.proc
+-# Should-Start:
+-# Required-Stop:     
++# Should-Start:      
++# Required-Stop:     $null
  # Should-Stop:
  # Default-Start:     B
  # Default-Stop:      
@@ -15,7 +20,7 @@ index df64e21..e4a54a6 100644
  ### END INIT INFO
  
  ISCSIADM=/sbin/iscsiadm
-@@ -56,7 +58,7 @@ case "$1" in
+@@ -56,7 +58,7 @@
  	rc_status -v
  	iscsi_mark_root_nodes
  	;;
@@ -24,7 +29,7 @@ index df64e21..e4a54a6 100644
  	rc_failed 0
  	;;
      status)
-@@ -68,13 +70,8 @@ case "$1" in
+@@ -68,13 +70,8 @@
  	    rc_status -v
  	fi
  	;;
@@ -39,12 +44,16 @@ index df64e21..e4a54a6 100644
  	exit 1
  	;;
  esac
-diff --git a/etc/initd/initd.suse b/etc/initd/initd.suse
-index d8b91cc..5c42b88 100644
---- a/etc/initd/initd.suse
-+++ b/etc/initd/initd.suse
-@@ -10,7 +10,9 @@
- # Should-Stop:
+--- open-iscsi-2.0-870-rc1/etc/initd/initd.suse
++++ open-iscsi-2.0-870-rc1/etc/initd/initd.suse
+@@ -6,11 +6,13 @@
+ # Provides:          iscsi
+ # Required-Start:    $network
+ # Should-Start:      iscsitarget
+-# Required-Stop:     
+-# Should-Stop:
++# Required-Stop:     $network
++# Should-Stop:       iscsitarget
  # Default-Start:     3 5
  # Default-Stop:      
 -# Short-Description: Starts and stops the iSCSI client initiator
@@ -54,7 +63,7 @@ index d8b91cc..5c42b88 100644
  #                    
  ### END INIT INFO
  
-@@ -190,13 +192,13 @@ case "$1" in
+@@ -190,13 +192,13 @@
  	    rc_status -v
  	fi
  	;;
diff --git a/open-iscsi.changes b/open-iscsi.changes
index b468ebf..49f4bd7 100644
--- a/open-iscsi.changes
+++ b/open-iscsi.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 28 23:34:55 CEST 2008 - cthiel@suse.de
+
+- fix init script
+
 -------------------------------------------------------------------
 Thu Jul 24 12:04:10 CEST 2008 - hare@suse.de
 
diff --git a/open-iscsi.spec b/open-iscsi.spec
index c1db034..2017a1c 100644
--- a/open-iscsi.spec
+++ b/open-iscsi.spec
@@ -2,9 +2,16 @@
 # spec file for package open-iscsi (Version 2.0.870)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -19,7 +26,7 @@ Group:          Productivity/Networking/Other
 PreReq:         %fillup_prereq %insserv_prereq
 AutoReqProv:    on
 Version:        2.0.870
-Release:        1
+Release:        10
 Provides:       linux-iscsi
 Obsoletes:      linux-iscsi
 %define iscsi_release 865
@@ -115,6 +122,8 @@ fi
 %doc %{_mandir}/man8/*
 
 %changelog
+* Fri Aug 29 2008 cthiel@suse.de
+- fix init script
 * Thu Jul 24 2008 hare@suse.de
 - Update to 2.0-870-rc1
   * Fix login redirection