From: Luk Claes <luk@debian.org>
Date: Fri, 25 May 2012 18:41:41 +0000 (+0200)
Subject: Add 19-iscsiadm-path.patch so osd_login works
X-Git-Tag: debian/1%1.2.6-1~2
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=dfefeb371aa45fd5af8f97b9687b9e88f9d13cb5;p=nfs-utils.git

Add 19-iscsiadm-path.patch so osd_login works
---

diff --git a/debian/changelog b/debian/changelog
index 267c575..962c3ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ nfs-utils (1:1.2.6-1) UNRELEASED; urgency=low
       - Add open-iscsi and watchdog to Recommends.
   * Check for blank exports file (Closes: #673798).
   * Add 18-osd_login-sbindir.patch to avoid FTBFS
+  * Add 19-iscsiadm-path.patch so osd_login works
 
  -- Luk Claes <luk@debian.org>  Fri, 25 May 2012 19:16:54 +0200
 
diff --git a/debian/patches/19-iscsiadm-path.patch b/debian/patches/19-iscsiadm-path.patch
new file mode 100644
index 0000000..0830a10
--- /dev/null
+++ b/debian/patches/19-iscsiadm-path.patch
@@ -0,0 +1,24 @@
+Index: nfs-utils/utils/osd_login/osd_login
+===================================================================
+--- nfs-utils.orig/utils/osd_login/osd_login	2012-05-25 20:15:33.000000000 +0200
++++ nfs-utils/utils/osd_login/osd_login	2012-05-25 20:40:37.000000000 +0200
+@@ -25,8 +25,6 @@
+ 
+ PATH="/sbin:/usr/sbin:/bin:/usr/bin"
+ 
+-iscsiadm=/sbin/iscsiadm
+-
+ PARENT_PID=$BASHPID
+ WATCHDOG_TIMEOUT=15
+ 
+@@ -90,8 +88,8 @@
+ login_iscsi_osd()
+ {
+ 	echo "login into: $1"
+-	if ! $iscsiadm -m discovery -o nonpersistent -t sendtargets -p $1 --login; then
+-		echo "$iscsiadm -m discovery -t sendtargets -p $1 --login returned error $? !"
++	if ! iscsiadm -m discovery -o nonpersistent -t sendtargets -p $1 --login; then
++		echo "iscsiadm -m discovery -t sendtargets -p $1 --login returned error $? !"
+ 		sleep 1;
+ 	fi
+ }
diff --git a/debian/patches/series b/debian/patches/series
index a746b89..0a0c3fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 16-mount.nfs.man-update-distinction-between-fstype.patch
 17-multiarch-kerberos-paths.patch
 18-osd_login-sbindir.patch
+19-iscsiadm-path.patch