rpms/iscsi-initiator-utils/FC-5 open-iscsi-5.0.4.446-update-initscripts-and-docs.patch, NONE, 1.1 iscsi-initiator-utils.spec, 1.8, 1.9 open-iscsi-5.0.4.446-initscript.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Apr 8 05:46:10 UTC 2006


Author: mchristi

Update of /cvs/dist/rpms/iscsi-initiator-utils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv31818

Modified Files:
	iscsi-initiator-utils.spec 
Added Files:
	open-iscsi-5.0.4.446-update-initscripts-and-docs.patch 
Removed Files:
	open-iscsi-5.0.4.446-initscript.patch 
Log Message:
update initscript and docs

open-iscsi-5.0.4.446-update-initscripts-and-docs.patch:
 README                 |  129 +++++++++++++++++----
 doc/iscsiadm.8         |  298 ++++++++++++++++++++++++++-----------------------
 doc/iscsid.8           |  174 ++++++++++++++--------------
 etc/initd/initd.redhat |  178 +++++++++++++++--------------
 etc/iscsid.conf        |    6 
 5 files changed, 450 insertions(+), 335 deletions(-)

--- NEW FILE open-iscsi-5.0.4.446-update-initscripts-and-docs.patch ---
diff -aurp open-iscsi-5.0.5.476/doc/iscsiadm.8 open-iscsi-5.0.5.476.work/doc/iscsiadm.8
--- open-iscsi-5.0.5.476/doc/iscsiadm.8	2006-01-23 13:42:28.000000000 -0600
+++ open-iscsi-5.0.5.476.work/doc/iscsiadm.8	2006-04-07 23:36:29.000000000 -0500
@@ -1,137 +1,161 @@
-.TH ISCSID 8 "July 2005" "" "Linux Administrator's Manual"
-.SH NAME
-iscsiadm \- Open-iSCSI Configuration Utility
-.SH SYNOPSIS
-.BI iscsiadm
-[OPTIONS]
-.SH "DESCRIPTION"
-Open-iSCSI persistent configuration is implemented as a DBM database
-available on all Linux installations.
-.p
-The database contains two tables:
-.TP
-Discovery table (discovery.db);
-.TP
-Node table (node.db).
-.PD
-.PP
-The regular place for iSCSI database files is in
-.I /var/db/iscsi/*.db
-.PP
-The iscsiadm utility is a command-line tool to manage (update, delete,
-insert, query) the persistent database.
-.PP
-The utility presents set of operations that a user can perform 
-on iSCSI nodes, sessions, connections, and discovery records.
-.PP
-Note that some of the iSCSI Node and iSCSI Discovery operations 
-do not require iSCSI daemon (iscsid) loaded.
-
-.SH OPTIONS
-.TP
-.B \-m, \-\-mode \fIop
-specify operational mode.
-.I op
-is either
-.I discovery
-or
-.I node
-.TP
-.B \-m discovery
-display all discovery records from the internal persistent discovery
-database.
-.TP
-.B \-m discovery \-\-type=\fItype\fB \-\-portal=\fIip:port\fB \-\-login
-perform
-.I type
-discovery for target portal with ip-address 
-.I ip
-and port 
-.I port
-\. Initiate Login for each discovered target if --login is specific.
-.TP
-.B \-m discovery \-\-record=\fIid\fB \-\-login
- perform discovery based on record 
-.I id
-in database.
-.TP
-.B \-m discovery \-\-record=\fIid\fB \-\-op=\fIop\fB \-\-name=\fIname\fB \-\-value=\fIvalue
-perform specific DB operation 
-.I op
-for specific discovery record with 
-.I id
-\. It could be one of:
-.I new
-, 
-.I delete
-, 
-.I update
- or 
-.I show
-\. In case of
-.I update
-, you have to provide 
-.I name
- and 
-.I value
-you wish to update
-.TP
-.B \-m node
-display all discovered nodes from internal persistent discovery
-database
-.TP
-.B \-m node \-\-record=\fIid\fB [ \-\-login | \-\-logout ]
-.TP
-.B \-m node \-\-record=\fIid\fB \-\-op=\fIop\fB [\-\-name=\fIname\fB \-\-value=\fIvalue\fB]
-perform specific DB operation 
-.I op
-for specific node with record 
-.I id
-\. It could be one of:
-.I new
-, 
-.I delete
-, 
-.I update
- or 
-.I show
-\. In case of
-.I update
-, you have to provide 
-.I name
-and 
-.I value
-you wish to update
-.TP
-.B \-m session
-display all active sessions and connections
-.TP
-.B \-m session \-\-record=[\fIid\fB[\fI:cid\fB]] [\-\-logout]
-perform operation for specific session with record
-.I id
-or display statistics if no operation specified. Operation will affect
-one connection only if
-.I \:cid
-is specified
-.TP
-.B \-d, \-\-debug \fIdebuglevel
-print debugging information
-.TP
-.B -V, --version
-display version and exit
-.TP
-.B -h, --help
-display this help and exit
-
-.SH FILES
-.TP
-/var/db/iscsi/*.db
-Open-iSCSI persistent configuration database
-
-.SH "SEE ALSO"
-.BR iscsid (8)
-.BR iscsid.conf (5)
-
-.SH AUTHORS
-Alex Aizman <itn780 at yahoo.com>
-Dmitry Yusupov <dmitry_yus at yahoo.com>
+.TH ISCSID 8 "July 2005" "" "Linux Administrator's Manual"
+.SH NAME
+iscsiadm \- Open-iSCSI Configuration Utility
+.SH SYNOPSIS
+.BI iscsiadm
+[OPTIONS]
+.SH "DESCRIPTION"
+Open-iSCSI persistent configuration is implemented as a DBM database
+available on all Linux installations.
+.p
+The database contains two tables:
+.TP
+Discovery table (discovery.db);
+.TP
+Node table (node.db).
+.PD
+.PP
+The regular place for iSCSI database files is in
+.I /var/db/iscsi/*.db
+.PP
+The iscsiadm utility is a command-line tool to manage (update, delete,
+insert, query) the persistent database.
+.PP
+The utility presents set of operations that a user can perform 
+on iSCSI nodes, sessions, connections, and discovery records.
+.PP
+Note that some of the iSCSI Node and iSCSI Discovery operations 
+do not require iSCSI daemon (iscsid) loaded.
+
+.SH OPTIONS
+.TP
+.B \-m, \-\-mode \fIop
+specify operational mode.
+.I op
+is either
+.I discovery
+or
+.I node
+.TP
+.B \-m discovery
+display all discovery records from the internal persistent discovery
+database.
+.TP
+.B \-m discovery \-\-type=\fItype\fB \-\-portal=\fIip:port\fB \-\-login
+perform
+.I type
+discovery for target portal with ip-address 
+.I ip
+and port 
+.I port
+\. Initiate Login for each discovered target if --login is specific.
+.TP
+.B \-m discovery \-\-record=\fIid\fB \-\-login
+ perform discovery based on record 
+.I id
+in database.
+.TP
+.B \-m discovery \-\-record=\fIid\fB \-\-op=\fIop\fB \-\-name=\fIname\fB \-\-value=\fIvalue
+perform specific DB operation 
+.I op
+for specific discovery record with 
+.I id
+\. It could be one of:
+.I new
+, 
+.I delete
+, 
+.I update
+ or 
+.I show
+\. In case of
+.I update
+, you have to provide 
+.I name
+ and 
+.I value
+you wish to update
+.TP
+.B \-m node
+display all discovered nodes from internal persistent discovery
+database
+.TP
+.B \-m node \-\-record=\fIid\fB
+display all parameters for given \fIid\fB.
+.TP
+.B \-m node \-\-record=\fIid\fB [\-\-login|\-l]
+login to node given by \fIid\fB.
+.TP
+.B \-m node \-\-record=\fIid\fB [\-\-logout|\-u]
+logout to node given by \fIid\fB.
+.TP
+.B \-m node \-\-record=\fIid\fB \-\-op=\fIop\fB [\-\-name=\fIname\fB \-\-value=\fIvalue\fB]
+perform specific DB operation 
+.I op
+for specific node with record 
+.I id
+\. It could be one of:
+.I new
+, 
+.I delete
+, 
+.I update
+ or 
+.I show
+\. In case of
+.I update
+, you have to provide 
+.I name
+and 
+.I value
+you wish to update
+.TP
+.B \-m session
+display all active sessions and connections
+.TP
+.B \-m session \-\-record=[\fIid\fB[\fI:cid\fB]] [\-\-logout|\-u]
+perform operation for specific session with record
+.I id
+or display statistics if no operation specified. Operation will affect
+one connection only if
+.I \:cid
+is specified
+.TP
+.B \-d, \-\-debug \fIdebuglevel
+print debugging information
+.TP
+.B -V, --version
+display version and exit
+.TP
+.B -h, --help
+display this help and exit
+
+.SH FILES
+.TP
+/etc/iscsid.conf
+The configuration file read by
+.B iscsid
+and
+.B iscsiadm
+on startup.
+.TP
+/etc/initiatorname.iscsi
+The file containing the iSCSI initiatorname
+and initiatoralias read by
+.B iscsid
+and
+.B iscsiadm
+on startup.
+.TP
+/var/db/iscsi/*.db
+Open-iSCSI persistent configuration database
+
+.SH "SEE ALSO"
+.BR iscsid (8)
+
+.SH AUTHORS
+Open-iSCSI project <http://www.open-iscsi.org/>
+.br
+Alex Aizman <itn780 at yahoo.com>
+.br
+Dmitry Yusupov <dmitry_yus at yahoo.com>
diff -aurp open-iscsi-5.0.5.476/doc/iscsid.8 open-iscsi-5.0.5.476.work/doc/iscsid.8
--- open-iscsi-5.0.5.476/doc/iscsid.8	2006-01-23 13:42:28.000000000 -0600
+++ open-iscsi-5.0.5.476.work/doc/iscsid.8	2006-04-07 23:36:29.000000000 -0500
@@ -1,86 +1,88 @@
-.TH ISCSID 8 "July 2005" "" "Linux Administrator's Manual"
-.SH NAME
-iscsid \- Open-iSCSI daemon
-.SH SYNOPSIS
-.BI iscsid
-[OPTION]
-.SH "DESCRIPTION"
-The
-.B iscsid
-implements the control path of iSCSI protocol, plus some management
-facilities. For example, the daemon could be configured to automatically 
-re-start discovery at startup, based on the contents of persistent 
-iSCSI database.
-.SH OPTIONS
-.TP
-.BI [-c|--config=]\fIconfig\-file\fP
-Read configuration from
-.I config\-file
-rather than the default
-.I /etc/iscsid.conf
-file.
-.TP
-.BI [-i|--initiatorname=]\fIiname\-file\fP
-Read initiator name from
-.I iname\-file
-rather than the default
-.I /etc/initiatorname.iscsi
-file.
-.TP
-.BI [-f|--foreground]
-run
-.B iscsid
-in the foreground.
-.TP
-.BI [-d|--debug]
-print debugging information.
-.TP
-.BI [-u|--uid=]\fIuid\fP
-run under user ID
-.I uid
-(default is the current user ID)
-.TP
-.BI [-g|--gid=]\fIgid\fP
-run under user group ID
-.I gid
-(default is the current user group ID).
-.TP
-.BI [-p|--pid=]\fIpid\-file\fP
-write process ID to
-.I pid\-file
-rather than the default
-.I /var/run/iscsid.pid
-.TP
-.BI [-h|--help]
-display this help and exit
-.TP
-.BI [-v|--version]
-display version and exit.
-
-.SH FILES
-.TP
-/etc/iscsid.conf
-The configuration file read by
-.B iscsid
-and
-.B iscsiadm
-on startup.
-.TP
-/etc/initiatorname.iscsi
-The file containing the iSCSI initiatorname
-and initiatoralias read by
-.B iscsid
-and
-.B iscsiadm
-on startup.
-.TP
-/var/db/iscsi/*.db
-Open-iSCSI persistent configuration database
-
-.SH "SEE ALSO"
-.BR iscsiadm (8)
-.BR iscsid.conf (5)
-
-.SH AUTHORS
-Alex Aizman <itn780 at yahoo.com>
-Dmitry Yusupov <dmitry_yus at yahoo.com>
+.TH ISCSID 8 "July 2005" "" "Linux Administrator's Manual"
+.SH NAME
+iscsid \- Open-iSCSI daemon
+.SH SYNOPSIS
+.BI iscsid
+[OPTION]
+.SH "DESCRIPTION"
+The
+.B iscsid
+implements the control path of iSCSI protocol, plus some management
+facilities. For example, the daemon could be configured to automatically 
+re-start discovery at startup, based on the contents of persistent 
+iSCSI database.
+.SH OPTIONS
+.TP
+.BI [-c|--config=]\fIconfig\-file\fP
+Read configuration from
+.I config\-file
+rather than the default
+.I /etc/iscsid.conf
+file.
+.TP
+.BI [-i|--initiatorname=]\fIiname\-file\fP
+Read initiator name from
+.I iname\-file
+rather than the default
+.I /etc/initiatorname.iscsi
+file.
+.TP
+.BI [-f|--foreground]
+run
+.B iscsid
+in the foreground.
+.TP
+.BI [-d|--debug]
+print debugging information.
+.TP
+.BI [-u|--uid=]\fIuid\fP
+run under user ID
+.I uid
+(default is the current user ID)
+.TP
+.BI [-g|--gid=]\fIgid\fP
+run under user group ID
+.I gid
+(default is the current user group ID).
+.TP
+.BI [-p|--pid=]\fIpid\-file\fP
+write process ID to
+.I pid\-file
+rather than the default
+.I /var/run/iscsid.pid
+.TP
+.BI [-h|--help]
+display this help and exit
+.TP
+.BI [-v|--version]
+display version and exit.
+
+.SH FILES
+.TP
+/etc/iscsid.conf
+The configuration file read by
+.B iscsid
+and
+.B iscsiadm
+on startup.
+.TP
+/etc/initiatorname.iscsi
+The file containing the iSCSI initiatorname
+and initiatoralias read by
+.B iscsid
+and
+.B iscsiadm
+on startup.
+.TP
+/var/db/iscsi/*.db
+Open-iSCSI persistent configuration database
+
+.SH "SEE ALSO"
+.BR iscsiadm (8)
+
+.SH AUTHORS
+Open-iSCSI project <http://www.open-iscsi.org/>
+.br
+Alex Aizman <itn780 at yahoo.com>
+.br
+Dmitry Yusupov <dmitry_yus at yahoo.com>
diff -aurp open-iscsi-5.0.5.476/etc/initd/initd.redhat open-iscsi-5.0.5.476.work/etc/initd/initd.redhat
--- open-iscsi-5.0.5.476/etc/initd/initd.redhat	2006-01-23 13:42:40.000000000 -0600
+++ open-iscsi-5.0.5.476.work/etc/initd/initd.redhat	2006-04-07 23:36:14.000000000 -0500
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# chkconfig: - 39 35
+# chkconfig: - 13 89
 # description: Starts and stops the iSCSI initiator
 #
 # pidfile: /var/run/iscsid.pid
@@ -8,130 +8,136 @@
 
 # Source function library.
 if [ -f /etc/init.d/functions ] ; then
-  . /etc/init.d/functions
+	. /etc/init.d/functions
 elif [ -f /etc/rc.d/init.d/functions ] ; then
-  . /etc/rc.d/init.d/functions
+	. /etc/rc.d/init.d/functions
 else
-  exit 0
+	exit 0
 fi
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
 
 ISCSID=`which iscsid`
 ISCSIADM=`which iscsiadm`
+prog=`basename $ISCSID`
+lockdir=/var/lock/subsys
 
 if [ -z $ISCSID ] || [ -z $ISCSIADM ]
 then
-    echo "open-iscsi not installed."
-    exit 1
+	echo "open-iscsi not installed."
+	exit 1
 fi
 
 start_iscsid()
 {
-    RETVAL=0
-    modprobe -q iscsi_tcp
-    daemon $ISCSID
-    RETVAL=$?
-    TARGETS=`$ISCSIADM -m node | sed 's@\[\(.*\)\] .*@\1 at g'`
-    for rec in $TARGETS
-    do
-	STARTUP=`$ISCSIADM -m node -r $rec | grep "node.conn\[0\].startup" | cut -d' ' -f3`
-	if [ $STARTUP = "automatic" ]
-	then
-        	$ISCSIADM -m node -r $rec -l
-	fi
-    done
-    return $RETVAL
+	RETVAL=0
+	modprobe -q iscsi_tcp
+	daemon $ISCSID
+	RETVAL=$?
+	TARGETS=`$ISCSIADM -m node | sed 's@\[\(.*\)\] .*@\1 at g'`
+	for rec in $TARGETS
+	do
+		STARTUP=`$ISCSIADM -m node -r $rec | grep "node.startup" | cut -d' ' -f3`
+		if [ $STARTUP = "automatic" ]
+		then
+			$ISCSIADM -m node -r $rec -l
+		fi
+	done
+
+	return $RETVAL
 }
 
 stop_iscsid()
 {
-    RETVAL=0
-    sync
-    TARGETS=`$ISCSIADM | grep "\[*\]" | sed 's@\[\(.*\)\] .*@\1 at g'`
-    for rec in $TARGETS
-    do
-        $ISCSIADM -m node -r $rec -u
-    done
-    pkill -KILL `basename $ISCSID`
-    modprobe -r iscsi_tcp
-    RETVAL=$?
-    return $RETVAL
+	RETVAL=0
+	sync
+	TARGETS=`$ISCSIADM -m session | grep "\[*\]" | sed 's@\[\(.*\)\] .*@\1 at g'`
+	for rec in $TARGETS
+	do
+		$ISCSIADM -m node -r $rec -u
+	done
+	pkill -KILL `basename $ISCSID`
+	modprobe -r iscsi_tcp
+	RETVAL=$?
+	return $RETVAL
 }
 
 start()
 {
-    RETVAL=0
-    echo -n "Starting iSCSI initiator service: "
-    PID=`pidofproc $ISCSID`
-    if [ -z $PID ]
-    then
-        start_iscsid
-    fi
-    if [ $RETVAL == "0" ]
-    then
-        echo_success
-    else
-        echo_failure
-    fi
-    echo
-    return $RETVAL
+	RETVAL=0
+	echo -n "Starting iSCSI initiator service: "
+	PID=`pidofproc $ISCSID`
+	if [ -z $PID ]
+	then
+		start_iscsid
+	fi
+
+	if [ $RETVAL == "0" ]
+	then
+		touch $lockdir/$prog
+		success
+	else
+		failure
+	fi
+	echo
+	return $RETVAL
 }
 
 stop()
 {
-    RETVAL=0
-    echo -n "Stopping iSCSI initiator service: "
-    PID=`pidofproc $ISCSID`
-    if [ $PID ]
-    then
-        stop_iscsid
-    fi
-    if [ $RETVAL == "0" ]
-    then
-        echo_success
-    else
-        echo_failure
-    fi
-    echo
-    return $RETVAL
+	RETVAL=0
+	echo -n "Stopping iSCSI initiator service: "
+	PID=`pidofproc $ISCSID`
+	if [ $PID ]
+	then
+		stop_iscsid
+	fi
+	if [ $RETVAL == "0" ]
+	then
+		rm -f $lockdir/$prog
+		success
+	else
+		failure
+	fi
+	echo
+	return $RETVAL
 }
 
 
 restart()
 {
-    stop
-    start
+	stop
+	start
 }
 
 status()
 {
-    PID=`pidofproc $ISCSID`
-    if [ ! $PID ]
-    then
-        echo "iSCSI initiator is stopped."
-        exit 1
-    else
-        echo "iSCSI initiator is running."
-    fi
+	PID=`pidofproc $ISCSID`
+	if [ ! $PID ]
+	then
+		echo "iSCSI initiator is stopped."
+		exit 1
+	else
+		echo "iSCSI initiator is running."
+	fi
 }
 
 case "$1" in
-  start)
-        start
-        ;;
-  stop)
-        stop
-        ;;
-  restart)
-        restart
-        ;;
-  status)
-        status
-        ;;
-  *)
-        echo $"Usage: $0 {start|stop|restart|status}"
-        exit 1
+	start)
+		start
+		;;
+	stop)
+		stop
+		;;
+	restart)
+		restart
+		;;
+	status)
+		status
+		;;
+	*)
+		echo $"Usage: $0 {start|stop|restart|status}"
+		exit 1
 esac
 
 exit 0
diff -aurp open-iscsi-5.0.5.476/etc/iscsid.conf open-iscsi-5.0.5.476.work/etc/iscsid.conf
--- open-iscsi-5.0.5.476/etc/iscsid.conf	2006-01-23 13:42:40.000000000 -0600
+++ open-iscsi-5.0.5.476.work/etc/iscsid.conf	2006-04-07 23:36:01.000000000 -0500
@@ -16,9 +16,9 @@ node.session.iscsi.MaxBurstLength = 1677
 node.session.iscsi.DefaultTime2Wait = 0
 node.session.iscsi.DefaultTime2Retain = 0
 node.session.iscsi.MaxConnections = 0
-node.cnx[0].iscsi.HeaderDigest = None
-node.cnx[0].iscsi.DataDigest = None
-node.cnx[0].iscsi.MaxRecvDataSegmentLength = 65536
+node.conn[0].iscsi.HeaderDigest = None
+node.conn[0].iscsi.DataDigest = None
+node.conn[0].iscsi.MaxRecvDataSegmentLength = 65536
 #discovery.sendtargets.auth.authmethod = CHAP
 #discovery.sendtargets.auth.username = dima
 #discovery.sendtargets.auth.password = aloha
diff -aurp open-iscsi-5.0.5.476/README open-iscsi-5.0.5.476.work/README
--- open-iscsi-5.0.5.476/README	2006-01-23 13:42:40.000000000 -0600
+++ open-iscsi-5.0.5.476.work/README	2006-04-07 23:37:03.000000000 -0500
@@ -4,7 +4,7 @@
 
 =================================================================
 
-                                                February 28, 2005
+                                                April 7, 2006
 
 Contents
 ========
@@ -58,7 +58,7 @@ Open-iSCSI is partitioned into user and 
 The kernel portion of Open-iSCSI is a from-scratch code
 licensed under GPL. The kernel part implements iSCSI data path
 (that is, iSCSI Read and iSCSI Write), and consists of two
-loadable modules: iscsi_if.ko and iscsi_tcp.ko.
+loadable modules: scsi_transport_iscsi.ko and iscsi_tcp.ko.
 
 User space contains the entire control plane: configuration
 manager, iSCSI Discovery, Login and Logout processing,
@@ -81,8 +81,20 @@ kernel config. You also need to enable "
 you use header or data digests. They are the kernel options,
 CONFIG_CRYPTO and CONFIG_CRYPTO_CRC32C, respectively.
 
-Compilation of the kernel Open-iSCSI modules requires a path
-to kernel sources:
+For kernels 2.6.11-2.6.15 there are compatibility patches that must be
+applied before compiling. Standing in the root of the open-iscsi source
+directory the following command must be done in order to apply the patch
+for your kernel:
+
+patch -p1 < kernel/2.6.11-compat.patch
+patch -p1 < kernel/2.6.12-compat.patch
+patch -p1 < kernel/2.6.13-compat.patch
+patch -p1 < kernel/2.6.14-and-2.6.15-compat.patch
+
+By default the kernel source found at
+/lib/modules/`uname -a`/build
+will be used to compile the open-iscsi modules. To specify a different
+kernel to build against use:
 
 	make KSRC=<kernel-src>
 
@@ -94,6 +106,12 @@ If you choose to install the Debian pack
 please read the file /usr/share/doc/linux-iscsi/README.debian for information
 on how to build kernel modules against your specific kernel.
 
+For Red Hat/Fedora and Debian distributions open-iscsi can be installed by
+typing "make install". This will copy iscsid and iscsiadm to /usr/sbin, the
+init script to /etc/init.d, and the kernel modules: iscsi_tcp.ko
+and scsi_transport_iscsi to /lib/modules/`uname -r`/kernel/drivers/scsi/
+overwriting existing iscsi modules.
+
 4. Open-iSCSI daemon
 ====================
 
@@ -181,40 +199,40 @@ Usage: iscsiadm [OPTION]
   -h, --help              display this help and exit
 
 
-    Usage examples:
+    Usage examples (using the one-letter options):
 
     1) SendTargets iSCSI Discovery:
 
-	    ./iscsiadm -m discovery --type sendtargets --portal 192.168.1.1:3260
+	    ./iscsiadm -m discovery -t sendtargets -p 192.168.1.1:3260
 
     2) iSCSI Login:
 
-	    ./iscsiadm -m node --record 0f23e4 --login
+	    ./iscsiadm -m node -r 0f23e4 -l
 
     3) iSCSI Logout:
 
-	    ./iscsiadm -m node --record 0f23e4 --logout
+	    ./iscsiadm -m node -r 0f23e4 -u
 
     4) Changing iSCSI parameter:
 
-	    ./iscsiadm -m node --record 0f23e4 --op update \
+	    ./iscsiadm -m node -r 0f23e4 -o update \
 		    -n node.cnx[0].iscsi.MaxRecvDataSegmentLength -v 65536
 
     5) Adding custom iSCSI Node:
 
-	    ./iscsiadm -m node --op new --portal 192.168.0.1:3260
+	    ./iscsiadm -m node -o new -p 192.168.0.1:3260
 
     6) Removing iSCSI Node:
 
-	    ./iscsiadm -m node --op delete --record 0a45f8
+	    ./iscsiadm -m node -o delete -r 0a45f8
 
     7) Display iSCSI Node configuration:
 
-	    ./iscsiadm -m node --record 0a45f8
+	    ./iscsiadm -m node -r 0a45f8
 
 	or
 
-	    ./iscsiadm -m node --op show --record 0a45f8
+	    ./iscsiadm -m node -o show -r 0a45f8
 
     8) Show all node records:
 
@@ -226,11 +244,11 @@ Usage: iscsiadm [OPTION]
 
    10) Display discovery record setting:
 
-            ./iscsiadm -m discovery --record 0a45f8
+            ./iscsiadm -m discovery -r 0a45f8
 
    11) Display session statistics:
 
-            ./iscsiadm -m session --record 00:0a45f8 --stats
+            ./iscsiadm -m session -r 00:0a45f8 --stats
 
 6. Configuration
 ================
@@ -242,17 +260,52 @@ exist in which case compiled-in default 
 for newer discovered Target nodes.
 
 See the man page and the example file for the current syntax.
-(no man page yet...)
-
+The manpages for iscsid, iscsiadm are in the doc subdirectory and can be
+installed in the appropriate man page directories and need to be manually
+copied into e.g. /usr/local/share/man8.
 
 7. Getting Started
 ==================
+There are three steps needed to set up a system to use iscsi storage:
+1. automate iscsi startup using the init script.
+2. discover targets.
+3. automate target logins for future system reboots.
+
+1. automate iscsi startup using the init script
+-----------------------------------------------
+
+Red Hat or Fedora:
+-----------------
+To start open-iscsi in Red Hat/Fedora you can do:
+
+	service open-iscsi start
+
+To get open-iscsi to automatically start at run time you may have to
+run:
+	chkconfig --level <levels> open-iscsi on
+Where <levels> are the run levels.
+
+And, to automatically mount a file system during startup
+you must have the partition entry in /etc/fstab marked with the "_netdev"
+option. For example this would mount a iscsi disk sdb:
+
+	/dev/sdb /mnt/iscsi ext3 _netdev 0 0
 
-Right now there is no installation script. Just load the module with
-command:
+SUSE or Debian:
+---------------
+Otherwise, if there is a initd script for your distro in etc/initd that
+gets installed with "make install"
 
-	insmod iscsi_if.ko
-	insmod iscsi_tcp.ko
+	/etc/init.d/open-iscsi start
+
+will usually get you started.
+
+Other:
+------
+If there is no initd script, you must start the tools by hand. First load the
+iscsi modules with:
+
+	modprobe -q iscsi_tcp
 
 after that start iSCSI daemon process:
 
@@ -264,19 +317,49 @@ redirected to the current console:
 	./iscsid -d8 -f &
 
 and use configuration utility to add/remove/update Discovery records,
-iSCSI Node records or monitor active iSCSI sessions:
+iSCSI Node records or monitor active iSCSI sessions (see above or the
+iscsiadm man files).
 
 	./iscsiadm
 
 
 To login:
 
-	    ./iscsiadm -m node --record <node rec> --login
+	./iscsiadm -m node -r <node rec> -l
 
 where <node rec> is the record of a discovered or manually
 added iSCSI Target Node (for iscsiadm usage examples see
 previous sections).
 
+2. discover targets
+-------------------
+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
+usefull only for re-discovery. The discovered targets (a.k.a. nodes)
+are stored as records in the xxx.db.
+
+The discovered targets are not logged into yet. Rather than logging
+into the discovered nodes (making LUs from those nodes available as
+storage), it is better to automate the login to the nodes we need.
+
+3. automate target logins for future system reboots
+---------------------------------------------------
+Note: this may only work for Red Hat, Fedora and SUSE configurations
+
+To automate login to a node, use the following with the record ID of the
+node discovered in the discovery above:
+	iscsiadm -m node --record <record ID> --op update -n node.startup -v automatic
+
+Or to set the "node.statup" attribute to "startup" as default for
+all sessions add the following to the /etc/iscsid.conf:
+
+	node.startup = automatic
+
+To login to all the automated nodes, simply restart the iscsi service
+e.g /etc/init.d/open-iscsi restart
+
 
 8. TBD
 ======


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/iscsi-initiator-utils/FC-5/iscsi-initiator-utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- iscsi-initiator-utils.spec	11 Feb 2006 03:39:24 -0000	1.8
+++ iscsi-initiator-utils.spec	8 Apr 2006 05:46:07 -0000	1.9
@@ -1,10 +1,10 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 5.0.5.476
-Release: 0.1
+Release: 0.2
 Source0: http://people.redhat.com/mchristi/iscsi/FC5/open-iscsi/rpm/open-iscsi-%{version}.tar.bz2
-Patch0: open-iscsi-5.0.4.446-initscript.patch
-Patch1: open-iscsi-5.0.4.446-add-iscsi-iname.patch
+Patch0: open-iscsi-5.0.4.446-add-iscsi-iname.patch
+Patch1: open-iscsi-5.0.4.446-update-initscripts-and-docs.patch
 Group: System Environment/Daemons
 License: GPL
 URL: http://www.open-iscsi.org
@@ -22,8 +22,8 @@
 %prep
 %setup -q -n %{name}-%{version} -c
 cd open-iscsi-%{version}
-%patch0 -p1 -b .initscript
-%patch1 -p1 -b .add-iscsi-iname
+%patch0 -p1 -b .add-iscsi-iname
+%patch1 -p1 -b .update-initscripts-and-docs.patch
 
 %build
 cd open-iscsi-%{version}
@@ -48,6 +48,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
+if [ ! -f /etc/initiatorname.iscsi ]; then
+	echo "InitiatorName=`/sbin/iscsi-iname`" > /etc/initiatorname.iscsi
+fi
+
 /sbin/chkconfig --add iscsi
 
 %preun
@@ -55,7 +59,6 @@
     /sbin/chkconfig --del iscsi
 fi
 
-
 %files
 %defattr(-,root,root)
 %config /etc/rc.d/init.d/iscsi
@@ -66,6 +69,16 @@
 %{_mandir}/*/*
 
 %changelog
+* Fri Apr 7 2006 Mike Christie <mchristi at redhat.com>
+- From Andy Henson <andy at zexia.co.uk>:
+  Autogenerate /etc/initiatorname.iscsi during install if not already present
+- Remove code to autogenerate /etc/initiatorname.iscsi from initscript
+- From dan.y.roche at gmail.com:
+  add touch and rm lock code
+- update README
+- update default iscsid.conf. "cnx" was not supported. The correct
+  id was "conn".
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5.0.5.476-0.1
 - bump again for double-long bug on ppc(64)
 


--- open-iscsi-5.0.4.446-initscript.patch DELETED ---




More information about the fedora-cvs-commits mailing list