[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, upstream-mnc, updated. 2.0-872-193-gde2c0e7

[Mike Christie]

The following commit has been merged in the upstream-mnc branch:
commit 287229740bc4ba97b072a458c3311dea8c49e4d9
Author: Hannes Reinecke <hare at suse.de>
Date:   Tue Jun 21 11:23:05 2011 +0200

    Allow LOCK_DIR to be set via CFLAGS
    
    For root on iSCSI we have to move idbm's LOCK_DIR to eg /etc/iscsi,
    as the /var directory might not be available. So make it configurable
    during compile-time.
    
    Signed-off-by: Hannes Reinecke <hare at suse.de>

diff --git a/usr/initiator.h b/usr/initiator.h
index 93e9b3b..8497c70 100644
--- a/usr/initiator.h
+++ b/usr/initiator.h
@@ -39,9 +39,11 @@
 #define INITIATOR_NAME_FILE	ISCSI_CONFIG_ROOT"initiatorname.iscsi"
 
 #define PID_FILE		"/var/run/iscsid.pid"
+#ifndef LOCK_DIR
 #define LOCK_DIR		"/var/lock/iscsi"
-#define LOCK_FILE		"/var/lock/iscsi/lock"
-#define LOCK_WRITE_FILE		"/var/lock/iscsi/lock.write"
+#endif
+#define LOCK_FILE		LOCK_DIR"/lock"
+#define LOCK_WRITE_FILE		LOCK_DIR"/lock.write"
 
 typedef enum iscsi_conn_state_e {
 	STATE_FREE,

-- 
Debian Open-iSCSI Packaging