diff -aurp open-iscsi-6.2.0.695/doc/iscsid.8 open-iscsi-6.2.0.695.man/doc/iscsid.8 --- open-iscsi-6.2.0.695/doc/iscsid.8 2006-04-27 13:36:24.000000000 -0500 +++ open-iscsi-6.2.0.695.man/doc/iscsid.8 2006-10-13 12:56:25.000000000 -0500 @@ -15,11 +15,11 @@ iSCSI database. .TP .BI [-c|--config=]\fIconfig\-file\fP Read configuration from \fIconfig\-file\fR rather than the default -\fI/etc/iscsid.conf\fR file. +\fI/etc/iscsi/iscsid.conf\fR file. .TP .BI [-i|--initiatorname=]\fIiname\-file\fP Read initiator name from \fIiname\-file\fR rather than the default -\fI/etc/initiatorname.iscsi\fR file. +\fI/etc/iscsi/initiatorname.iscsi\fR file. .TP .BI [-f|--foreground] run @@ -47,14 +47,14 @@ display version and exit. .SH FILES .TP -/etc/iscsid.conf +/etc/iscsi/iscsid.conf The configuration file read by .B iscsid and .B iscsiadm on startup. .TP -/etc/initiatorname.iscsi +/etc/iscsi/initiatorname.iscsi The file containing the iSCSI initiatorname and initiatoralias read by .B iscsid @@ -62,7 +62,7 @@ and .B iscsiadm on startup. .TP -/var/db/iscsi/*.db +/var/lib/iscsi/nodes Open-iSCSI persistent configuration database .SH "SEE ALSO" diff -aurp open-iscsi-6.2.0.695/README open-iscsi-6.2.0.695.man/README --- open-iscsi-6.2.0.695/README 2006-08-23 15:36:44.000000000 -0500 +++ open-iscsi-6.2.0.695.man/README 2006-10-13 12:58:04.000000000 -0500 @@ -123,7 +123,7 @@ For help, run: Usage: iscsid [OPTION] - -c, --config=[path] Execute in the config file (/etc/iscsid.conf). + -c, --config=[path] Execute in the config file (/etc/iscsi/iscsid.conf). -f, --foreground run iscsid in the foreground -d, --debug debuglevel print debugging information -u, --uid=uid run as uid, default is current user @@ -141,10 +141,10 @@ available on all Linux installations. The database contains two tables: -- Discovery table (discovery.db); -- Node table (node.db). +- Discovery (/var/lib/iscsi/send_targets) +- Node table (/var/lib/iscsi/nodes) -The regular place for iSCSI database files: /var/db/iscsi/*.db +The regular place for iSCSI database files: /var/lib/iscsi The iscsiadm utility is a command-line tool to manage (update, delete, insert, query) the persistent database. @@ -250,7 +250,7 @@ Usage: iscsiadm [OPTION] 6. Configuration ================ -The default configuration file is /etc/iscsid.conf. This file contains +The default configuration file is /etc/iscsi/iscsid.conf. This file contains only configuration that could be overwritten by iSCSI Discovery, or manualy updated via iscsiadm utility. Its OK if this file does not exist in which case compiled-in default configuration will take place @@ -333,9 +333,9 @@ and port of the portal of a discovered o Once iscsi is up, you can perform discovery to targets using: iscsiadm -m discovery -t sendtargets -p 192.168.1.1:3260 -While discovery targets are kept in the discovery.db, they are +While discovery targets are kept in the discovery db, they are usefull only for re-discovery. The discovered targets (a.k.a. nodes) -are stored as records in the xxx.db. +are stored as records in the /var/lib/iscsi/nodes The discovered targets are not logged into yet. Rather than logging into the discovered nodes (making LUs from those nodes available as @@ -350,7 +350,7 @@ node discovered in the discovery above: iscsiadm -m node -T targetname -p ip:port --op update -n node.conn[0].startup -v automatic Or to set the "node.conn[0].statup" attribute to "startup" as default for -all sessions add the following to the /etc/iscsid.conf: +all sessions add the following to the /etc/iscsi/iscsid.conf: node.conn[0].startup = automatic