[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, master, updated. debian/2.0.871.3-6-39-g1409ff0

[Ritesh Raj Sarraf]

The following commit has been merged in the master branch:
commit cb80472f8a7a645a9b2586376a5c628a557e1cdc
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date:   Tue Apr 24 09:37:43 2012 +0530

    Fix default iscsid path in config file
    
    Thanks: Michal Suchanek
    Closes: #650221

diff --git a/debian/patches/04_fix_iscsi_path.patch b/debian/patches/04_fix_iscsi_path.patch
new file mode 100644
index 0000000..d1620a7
--- /dev/null
+++ b/debian/patches/04_fix_iscsi_path.patch
@@ -0,0 +1,14 @@
+Fix path for iscsid as we ship it in /usr/sbin
+Index: open-iscsi/etc/iscsid.conf
+===================================================================
+--- open-iscsi.orig/etc/iscsid.conf	2012-04-07 20:18:02.891543275 +0530
++++ open-iscsi/etc/iscsid.conf	2012-04-24 09:36:41.058624577 +0530
+@@ -20,7 +20,7 @@
+ # iscsid.startup = /etc/rc.d/init.d/iscsid force-start
+ # 
+ # Default for upstream open-iscsi scripts (uncomment to activate).
+-iscsid.startup = /sbin/iscsid
++iscsid.startup = /usr/sbin/iscsid
+ 
+ 
+ #############################
diff --git a/debian/patches/series b/debian/patches/series
index 6f014b3..081651f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_spelling-errors-and-manpage-hyphen-fixes.patch
 02_make-iscsistart-a-dynamic-binary.patch
 03_hardened-build-flags.patch
+04_fix_iscsi_path.patch

-- 
Debian Open-iSCSI Packaging