diff options
| author | mnc <mnc@d7303112-9cec-0310-bdd2-e83a94d6c2b6> | 2007-04-24 05:31:49 +0000 |
|---|---|---|
| committer | mnc <mnc@d7303112-9cec-0310-bdd2-e83a94d6c2b6> | 2007-04-24 05:31:49 +0000 |
| commit | 231a0738880837f03c20654e45efebd6972ce01f (patch) | |
| tree | 638f3e348da0bd0c3ce0b49a8d62dee09c3296ec /usr/initiator.h | |
| parent | 69455efa4b6d6fbebb3869b69c43e33b6dacbe9e (diff) | |
| download | open-iscsi-231a0738880837f03c20654e45efebd6972ce01f.tar.gz | |
when we have been doing discovery we have been overwriting old node records but we have not been deleting records of portals that we not longer returned. This patch does both now. One odd item is that if you discovery a target from two sources (st, isns, statically), the target is bound to the last discovery source.
git-svn-id: svn://svn.berlios.de/open-iscsi@806 d7303112-9cec-0310-bdd2-e83a94d6c2b6
Diffstat (limited to 'usr/initiator.h')
| -rw-r--r-- | usr/initiator.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/usr/initiator.h b/usr/initiator.h index 5070202..a2ff51a 100644 --- a/usr/initiator.h +++ b/usr/initiator.h @@ -32,11 +32,18 @@ #include "actor.h" #include "queue.h" -#define ST_CONFIG_DIR "/etc/iscsi/send_targets" -#define NODE_CONFIG_DIR "/etc/iscsi/nodes" -#define CONFIG_FILE "/etc/iscsi/iscsid.conf" +#define ISCSI_CONFIG_ROOT "/etc/iscsi/" +#define SLP_CONFIG_DIR ISCSI_CONFIG_ROOT"slp" +#define ISNS_CONFIG_DIR ISCSI_CONFIG_ROOT"isns" +#define STATIC_CONFIG_DIR ISCSI_CONFIG_ROOT"static" +#define ST_CONFIG_DIR ISCSI_CONFIG_ROOT"send_targets" + +#define ST_CONFIG_NAME "st_config" + +#define NODE_CONFIG_DIR ISCSI_CONFIG_ROOT"nodes" +#define CONFIG_FILE ISCSI_CONFIG_ROOT"iscsid.conf" #define PID_FILE "/var/run/iscsid.pid" -#define INITIATOR_NAME_FILE "/etc/iscsi/initiatorname.iscsi" +#define INITIATOR_NAME_FILE ISCSI_CONFIG_ROOT"initiatorname.iscsi" #define LOCK_DIR "/var/lock/iscsi" #define LOCK_FILE "/var/lock/iscsi/lock" #define LOCK_WRITE_FILE "/var/lock/iscsi/lock.write" |