[Glibc-bsd-commits] r3773 - in tags/istgt: . 0.4~20111008-1/debian 0.4~20111008-1/debian/patches
Arno Töll
atoell-guest at alioth.debian.org
Wed Oct 26 23:41:25 UTC 2011
Author: atoell-guest
Date: 2011-10-26 23:41:25 +0000 (Wed, 26 Oct 2011)
New Revision: 3773
Added:
tags/istgt/0.4~20111008-1/
tags/istgt/0.4~20111008-1/debian/changelog
tags/istgt/0.4~20111008-1/debian/init
tags/istgt/0.4~20111008-1/debian/patches/add-istgtcontrol-manpage
Removed:
tags/istgt/0.4~20111008-1/debian/changelog
tags/istgt/0.4~20111008-1/debian/init
tags/istgt/0.4~20111008-1/debian/patches/add-istgtcontrol-manpage
Log:
[svn-buildpackage] Tagging istgt 0.4~20111008-1
Deleted: tags/istgt/0.4~20111008-1/debian/changelog
===================================================================
--- trunk/istgt/debian/changelog 2011-10-22 19:30:52 UTC (rev 3763)
+++ tags/istgt/0.4~20111008-1/debian/changelog 2011-10-26 23:41:25 UTC (rev 3773)
@@ -1,45 +0,0 @@
-istgt (0.4~20110928-2) UNRELEASED; urgency=low
-
- * NOT RELEASED YET
- * Add patch `add-istgtcontrol-manpage' which adds a manpage for the
- istgtcontrol command.
-
- -- Arno Töll <debian at toell.net> Fri, 07 Oct 2011 19:55:45 +0200
-
-istgt (0.4~20110928-1) unstable; urgency=low
-
- * New upstream release
- * Adapt to dpkg 1.16.1 API changes regarding build flags. This enables
- hardening build flags. This means, istgt is now being built with
- -fstack-protector and other security related build flags.
-
- -- Arno Töll <debian at toell.net> Fri, 07 Oct 2011 10:54:47 -0400
-
-istgt (0.4~20110907-1) unstable; urgency=low
-
- * New upstream release
- * Make debian/copyright more readable
- * Provide a non-functional watch file to follow glibc-bsd conventions to
- denote the problem with it in a comment
- * Fix a not detected build failure due to a problem in upstream's Makefile
- for the GNU/Hurd architecture (`make-build-failures-fatal.patch'). This
- patch has been forwarded and merged upstream
- * Remove `handle-destdir.patch' - it has been merged upstream
- * Refresh `fix-installdir.patch'
-
- -- Arno Töll <debian at toell.net> Wed, 14 Sep 2011 22:40:25 +0200
-
-istgt (0.4~20110717-1) unstable; urgency=low
-
- [ Arno Töll ]
- * Make upstream Makefile honor $(DESTDIR) (`handle-destdir.patch')
- * Install binaries to /sbin instead of /bin (`fix-installdir.patch')
- * Initial release. (Closes: #636139: ITP: istgt -- iSCSI userspace
- target daemon for Unix-like operating systems)
-
- [ Robert Millan ]
- * Require libcam-dev on kfreebsd-any.
- * Set Dm-Upload-Allowed: yes.
- * Add myself to Uploaders.
-
- -- Robert Millan <rmh at debian.org> Mon, 01 Aug 2011 00:12:35 +0200
Copied: tags/istgt/0.4~20111008-1/debian/changelog (from rev 3772, trunk/istgt/debian/changelog)
===================================================================
--- tags/istgt/0.4~20111008-1/debian/changelog (rev 0)
+++ tags/istgt/0.4~20111008-1/debian/changelog 2011-10-26 23:41:25 UTC (rev 3773)
@@ -0,0 +1,48 @@
+istgt (0.4~20111008-1) unstable; urgency=low
+
+ * New upstream release
+ * Add patch `add-istgtcontrol-manpage' which adds a manpage for the
+ istgtcontrol command.
+ * Check whether istgt is actually running after starting up the daemon in its
+ init script. That's required because istgt may fail for the socket setup
+ after forking into the background.
+
+ -- Arno Töll <debian at toell.net> Thu, 27 Oct 2011 01:40:23 +0200
+
+istgt (0.4~20110928-1) unstable; urgency=low
+
+ * New upstream release
+ * Adapt to dpkg 1.16.1 API changes regarding build flags. This enables
+ hardening build flags. This means, istgt is now being built with
+ -fstack-protector and other security related build flags.
+
+ -- Arno Töll <debian at toell.net> Fri, 07 Oct 2011 10:54:47 -0400
+
+istgt (0.4~20110907-1) unstable; urgency=low
+
+ * New upstream release
+ * Make debian/copyright more readable
+ * Provide a non-functional watch file to follow glibc-bsd conventions to
+ denote the problem with it in a comment
+ * Fix a not detected build failure due to a problem in upstream's Makefile
+ for the GNU/Hurd architecture (`make-build-failures-fatal.patch'). This
+ patch has been forwarded and merged upstream
+ * Remove `handle-destdir.patch' - it has been merged upstream
+ * Refresh `fix-installdir.patch'
+
+ -- Arno Töll <debian at toell.net> Wed, 14 Sep 2011 22:40:25 +0200
+
+istgt (0.4~20110717-1) unstable; urgency=low
+
+ [ Arno Töll ]
+ * Make upstream Makefile honor $(DESTDIR) (`handle-destdir.patch')
+ * Install binaries to /sbin instead of /bin (`fix-installdir.patch')
+ * Initial release. (Closes: #636139: ITP: istgt -- iSCSI userspace
+ target daemon for Unix-like operating systems)
+
+ [ Robert Millan ]
+ * Require libcam-dev on kfreebsd-any.
+ * Set Dm-Upload-Allowed: yes.
+ * Add myself to Uploaders.
+
+ -- Robert Millan <rmh at debian.org> Mon, 01 Aug 2011 00:12:35 +0200
Deleted: tags/istgt/0.4~20111008-1/debian/init
===================================================================
--- trunk/istgt/debian/init 2011-10-22 19:30:52 UTC (rev 3763)
+++ tags/istgt/0.4~20111008-1/debian/init 2011-10-26 23:41:25 UTC (rev 3773)
@@ -1,135 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: istgt
-# Required-Start: $network $local_fs $remote_fs
-# Required-Stop: $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: iSCSI userspace target for kFreeBSD systems
-# Description: iSCSI userspace target for kFreeBSD systems
-### END INIT INFO
-
-# Author: Arno Töll <debian at toell.net>
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="istgt iSCSI target"
-NAME=istgt
-DAEMON=/usr/sbin/istgt
-PIDFILE=/var/run/$NAME.pid
-DAEMON_ARGS="-c /etc/istgt/istgt.conf -p $PIDFILE"
-SCRIPTNAME=/etc/init.d/$NAME
-CONFIG=/etc/istgt/istgt.conf
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-if [ ! -r $CONFIG ] ; then
- [ "$VERBOSE" != no ] && log_warning_msg "Not Starting $DESC: $CONFIG does not exit"
- exit 0
-fi
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
- # Return
- # 0 if daemon has been started
- # 1 if daemon was already running
- # 2 if daemon could not be started
- start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
- || return 1
- start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
- $DAEMON_ARGS \
- || return 2
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
- # Return
- # 0 if daemon has been stopped
- # 1 if daemon was already stopped
- # 2 if daemon could not be stopped
- # other if a failure occurred
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
- RETVAL="$?"
- [ "$RETVAL" = 2 ] && return 2
- # Wait for children to finish too if this is a daemon that forks
- # and if the daemon is only ever run from this initscript.
- start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
- [ "$?" = 2 ] && return 2
- # Many daemons don't delete their pidfiles when they exit.
- rm -f $PIDFILE
- return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
- start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
- return 0
-}
-
-case "$1" in
- start)
- [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
- do_start
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- stop)
- [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- restart|force-reload)
- #
- # If the "reload" option is implemented then remove the
- # 'force-reload' alias
- #
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
- ;;
- *)
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
- ;;
-esac
-
-:
Copied: tags/istgt/0.4~20111008-1/debian/init (from rev 3771, trunk/istgt/debian/init)
===================================================================
--- tags/istgt/0.4~20111008-1/debian/init (rev 0)
+++ tags/istgt/0.4~20111008-1/debian/init 2011-10-26 23:41:25 UTC (rev 3773)
@@ -0,0 +1,144 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: istgt
+# Required-Start: $network $local_fs $remote_fs
+# Required-Stop: $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: iSCSI userspace target for kFreeBSD systems
+# Description: iSCSI userspace target for kFreeBSD systems
+### END INIT INFO
+
+# Author: Arno Töll <debian at toell.net>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="istgt iSCSI target"
+NAME=istgt
+DAEMON=/usr/sbin/istgt
+PIDFILE=/var/run/$NAME.pid
+DAEMON_ARGS="-c /etc/istgt/istgt.conf -p $PIDFILE"
+SCRIPTNAME=/etc/init.d/$NAME
+CONFIG=/etc/istgt/istgt.conf
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+if [ ! -r $CONFIG ] ; then
+ [ "$VERBOSE" != no ] && log_warning_msg "Not Starting $DESC: $CONFIG does not exit"
+ exit 0
+fi
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+ # Return
+ # 0 if daemon has been started
+ # 1 if daemon was already running
+ # 2 if daemon could not be started
+ start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+ || return 1
+ start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+ $DAEMON_ARGS \
+ || return 2
+
+ RETVAL=0
+ for i in 1 2 3 4 5 ; do
+ sleep 1
+ status_of_proc -p $PIDFILE "$DAEMON" "$NAME" || RETVAL=$?
+ [ "$RETVAL" = 0 ] && return 0
+ done
+
+ [ "$RETVAL" != 0 ] && return 2
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+ # Return
+ # 0 if daemon has been stopped
+ # 1 if daemon was already stopped
+ # 2 if daemon could not be stopped
+ # other if a failure occurred
+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
+ RETVAL="$?"
+ [ "$RETVAL" = 2 ] && return 2
+ # Wait for children to finish too if this is a daemon that forks
+ # and if the daemon is only ever run from this initscript.
+ start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
+ [ "$?" = 2 ] && return 2
+ # Many daemons don't delete their pidfiles when they exit.
+ rm -f $PIDFILE
+ return "$RETVAL"
+}
+
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+ start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
+ return 0
+}
+
+case "$1" in
+ start)
+ [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
+ do_start
+ case "$?" in
+ 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+ 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ esac
+ ;;
+ stop)
+ [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+ 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ esac
+ ;;
+ status)
+ status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+ ;;
+ restart|force-reload)
+ #
+ # If the "reload" option is implemented then remove the
+ # 'force-reload' alias
+ #
+ log_daemon_msg "Restarting $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1)
+ do_start
+ case "$?" in
+ 0) log_end_msg 0 ;;
+ 1) log_end_msg 1 ;; # Old process is still running
+ *) log_end_msg 1 ;; # Failed to start
+ esac
+ ;;
+ *)
+ # Failed to stop
+ log_end_msg 1
+ ;;
+ esac
+ ;;
+ *)
+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+ exit 3
+ ;;
+esac
+
+:
Deleted: tags/istgt/0.4~20111008-1/debian/patches/add-istgtcontrol-manpage
===================================================================
--- trunk/istgt/debian/patches/add-istgtcontrol-manpage 2011-10-22 19:30:52 UTC (rev 3763)
+++ tags/istgt/0.4~20111008-1/debian/patches/add-istgtcontrol-manpage 2011-10-26 23:41:25 UTC (rev 3773)
@@ -1,209 +0,0 @@
-Description: Add istgtcontrol manpage
- Add the manpages for the istgtcontrol.1 command. Modified files:
- .
- * doc/istgtcontrol.1.in - new file
- * doc/Makefile.in - change Makefile to make use of the Makefile
- Forwarded: Yes
- Author: Arno Töll <debian at toell.net>
- Applied-Upstream: not yet
- Last-Update: 2010-10-07
-
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -19,22 +19,24 @@
-
- source =
- header =
--document = QUICKSTART QUICKSTART.jp istgt.1.in
-+document = QUICKSTART QUICKSTART.jp
- sample =
-+MANPAGES = $(patsubst %.1.in, %.1, $(wildcard *.1.in))
-
- DISTDIR = $(top_srcdir)/`cat $(top_srcdir)/distdir`
- DISTFILES = Makefile.in \
- $(header) $(source) \
- $(document) $(sample)
-+DISTFILES += $(MANPAGES)
-
- #########################################################################
-
--all: istgt.1
-+all: $(MANPAGES)
-
--istgt.1:
-+$(MANPAGES):
- $(SED) -e 's:%%PREFIX%%:$(prefix):g' \
- -e 's:%%CONFIGDIR%%:$(configdir):g' \
-- -e 's:%%MEDIADIR%%:$(mediadir):g' < istgt.1.in > $@
-+ -e 's:%%MEDIADIR%%:$(mediadir):g' < $(patsubst %.1, %.1.in, $@) > $@
-
- dist: $(DISTFILES)
- mkdir $(DISTDIR)/$(subdir)
-@@ -44,9 +46,13 @@
- done
-
- install: install-dirs
-- install -c -m 0644 istgt.1 $(DESTDIR)$(mandir)/man1/
-- -rm -f $(DESTDIR)$(mandir)/man1/istgt.1.gz
-- gzip -9 $(DESTDIR)$(mandir)/man1/istgt.1
-+ set -e
-+ for file in $(MANPAGES) ; \
-+ do \
-+ install -c -m 0644 $$file $(DESTDIR)$(mandir)/man1/ ; \
-+ rm -f $(DESTDIR)$(mandir)/man1/$$file.gz ; \
-+ gzip -9 $(DESTDIR)$(mandir)/man1/$$file ; \
-+ done
-
- install-doc: install-doc-dirs
- install -c -m 0644 $(top_srcdir)/README $(DESTDIR)$(datadir)/doc/istgt/
-@@ -61,7 +67,7 @@
- mkdir -p $(DESTDIR)$(datadir)/doc/istgt
-
- clean:
-- -rm -f istgt.1
-+ -rm -f $(MANPAGES)
- -rm -f a.out *.o *.core
- -rm -f *~
-
---- /dev/null
-+++ b/doc/istgtcontrol.1.in
-@@ -0,0 +1,139 @@
-+.TH istgtcontrol 1 "Oct 07, 2011" "istgtcontrol"
-+.SH NAME
-+istgtcontrol \- istgt iSCSI target command utility
-+.SH SYNOPSIS
-+.B istgtcontrol
-+[options] <command> [<file>]
-+.SH DESCRIPTION
-+\fBistgtcontrol\fP is a command and control utility for \fBistgt\fP(1).
-+It can be used to query and change the status of a local or remote
-+\fBistgt\fP instance.
-+.PP
-+\fBistgtcontrol\fP supports the commands denoted below to interact with
-+the \fBistgt\fP instance. By default it connects and authenticates to
-+the iSCSI target portal specified in the \fBistgtcontrol.conf\fP
-+configuration file and uses CHAP credentials denoted there, if any.
-+Both can be overridden by using the respecitve command line arguments.
-+.SH COMMANDS
-+
-+\fBistgtcontrol\fP understands the following commands which can be
-+forwarded to \fBistgt\fP:
-+
-+.TP
-+.BI "noop"
-+Do not actually do anything, but test responsiveness of the portal and
-+test CHAP credentials only.
-+.TP
-+.BI "version"
-+Retrieve the \fBistgt\fP version number providing the iSCSI
-+portal \fBistgtcontrol\fP connected to.
-+.TP
-+.BI "list"
-+List all, or the specified targets only, which shared by the portal.
-+.TP
-+.BI "load"
-+Load a new media to the specified unit. This command issues the same
-+command as if a drive tray had been closed on a SCSI device.
-+
-+.TP
-+.BI "unload"
-+Unload a media from the specified unit. This command issues the same
-+command as if the drive tray had been opened from a SCSI device.
-+
-+.TP
-+.BI "change" " \fIfile\fP"
-+Change the loaded media by the specified unit. This command is
-+equivalent as if a new media (for example a DVD-ROM or tape cartridge) had
-+been inserted in the SCSI drive. The "\fIfile\fP" argument is interpreted
-+as filename to be loaded.
-+
-+.TP
-+.BI "reset"
-+Reset the specified LUN of the portal.
-+.TP
-+.BI "info"
-+Display all connections of the portal
-+
-+.SH OPTIONS
-+.TP
-+.BI \-c " \fIconfig\fP"
-+Use specified file as configuration file instead of the default file.
-+.TP
-+
-+.BI -h " \fIhost\fP"
-+Override the target portal by the specified host name or IP address. This
-+defaults to "localhost" if no other host was specified in the
-+configuration file.
-+.TP
-+.BI -p " \fIport\fP"
-+Override the target portal port by the specified port number. This defaults
-+to "3261" if no other port was specified in the configuration file.
-+.TP
-+.BI -t " \fItarget\fP"
-+Specifies the target IQN which should be affected by the command given.
-+There may be a default given in the configuration file.
-+.TP
-+.BI -l " \fIlun\fP"
-+Specifies the target LUN which should be affected by the command given.
-+This defaults to "0" unless another default was provided in the configuration
-+file.
-+.TP
-+.BI -f " \fIflags\fP"
-+Specifies flags passed to the portal when loading a new media. This
-+defaults to "ro". Supported \fIflags\fP are: "ro", "rw", "extend" and
-+"dynamic".
-+.TP
-+.BI -s " \fIsize\fP"
-+Specifies the size of the meda to be loaded. The default is to auto-detect the
-+media size.
-+.TP
-+.BI -q
-+Quiet mode, supress non-critical outputs.
-+.TP
-+.BI -v
-+Verbose mode, gives more output during operations.
-+.TP
-+.BI -A " \fImethod\fP"
-+Sets the preferred authentication method for logging in to the portal. This
-+overrides any method specified in the configuration file. Supported
-+methods are either CHAP/Mutual or CHAP/Auto.
-+.TP
-+.BI -U " \fIuser\fP"
-+Sets the user to authenticate on the portal. This overrides any username
-+specified in the configuration file.
-+.TP
-+.BI -S " \fIsecret\fP"
-+Set the secret used to authenticate on the portal. This overrides any
-+secret specified in the configuration file.
-+.TP
-+.BI -M " \fImuser\fP"
-+Set the mutual authentication user. This overrides any user specified in
-+the configuration file.
-+.TP
-+.BI -R " \fImsecret\fP"
-+Set the mutual authentication secret. This overrides any secret
-+specified in the configuration file.
-+.TP
-+.BI -H
-+Display a brief usage summary and exit.
-+.TP
-+.BI -V
-+Display the \fBistgtcontrol\fP version number and exit.
-+.TP
-+
-+
-+.SH FILES
-+.PD 0
-+.TP
-+.I %%CONFIGDIR%%/istgtcontrol.conf
-+Configuration file
-+
-+.PD
-+.SH SEE ALSO
-+\fBistgt\fP(1)
-+.PD
-+.SH AUTHORS
-+Daisuke Aoyama <aoyama at peach.ne.jp>
-+
-+This manual page was written by Arno Töll (<debian at toell.net>) for the Debian
-+GNU/kFreeBSD system (but may be used by others).
Copied: tags/istgt/0.4~20111008-1/debian/patches/add-istgtcontrol-manpage (from rev 3770, trunk/istgt/debian/patches/add-istgtcontrol-manpage)
===================================================================
--- tags/istgt/0.4~20111008-1/debian/patches/add-istgtcontrol-manpage (rev 0)
+++ tags/istgt/0.4~20111008-1/debian/patches/add-istgtcontrol-manpage 2011-10-26 23:41:25 UTC (rev 3773)
@@ -0,0 +1,210 @@
+Description: Add istgtcontrol manpage
+ Add the manpages for the istgtcontrol.1 command. Modified files:
+ .
+ * doc/istgtcontrol.1.in - new file
+ * doc/Makefile.in - change Makefile to make use of the Makefile
+ Forwarded: Yes
+ Author: Arno Töll <debian at toell.net>
+ Applied-Upstream: not yet
+ Last-Update: 2010-10-07
+
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -19,22 +19,24 @@
+
+ source =
+ header =
+-document = QUICKSTART QUICKSTART.jp istgt.1.in
++document = QUICKSTART QUICKSTART.jp
+ sample =
++MANPAGES = $(patsubst %.1.in, %.1, $(wildcard *.1.in))
+
+ DISTDIR = $(top_srcdir)/`cat $(top_srcdir)/distdir`
+ DISTFILES = Makefile.in \
+ $(header) $(source) \
+ $(document) $(sample)
++DISTFILES += $(MANPAGES)
+
+ #########################################################################
+
+-all: istgt.1
++all: $(MANPAGES)
+
+-istgt.1:
++$(MANPAGES):
+ $(SED) -e 's:%%PREFIX%%:$(prefix):g' \
+ -e 's:%%CONFIGDIR%%:$(configdir):g' \
+- -e 's:%%MEDIADIR%%:$(mediadir):g' < istgt.1.in > $@
++ -e 's:%%MEDIADIR%%:$(mediadir):g' < $(patsubst %.1, %.1.in, $@) > $@
+
+ dist: $(DISTFILES)
+ mkdir $(DISTDIR)/$(subdir)
+@@ -44,9 +46,13 @@
+ done
+
+ install: install-dirs
+- install -c -m 0644 istgt.1 $(DESTDIR)$(mandir)/man1/
+- -rm -f $(DESTDIR)$(mandir)/man1/istgt.1.gz
+- gzip -9 $(DESTDIR)$(mandir)/man1/istgt.1
++ set -e
++ for file in $(MANPAGES) ; \
++ do \
++ install -c -m 0644 $$file $(DESTDIR)$(mandir)/man1/ ; \
++ rm -f $(DESTDIR)$(mandir)/man1/$$file.gz ; \
++ gzip -9 $(DESTDIR)$(mandir)/man1/$$file ; \
++ done
+
+ install-doc: install-doc-dirs
+ install -c -m 0644 $(top_srcdir)/README $(DESTDIR)$(datadir)/doc/istgt/
+@@ -61,7 +67,7 @@
+ mkdir -p $(DESTDIR)$(datadir)/doc/istgt
+
+ clean:
+- -rm -f istgt.1
++ -rm -f $(MANPAGES)
+ -rm -f a.out *.o *.core
+ -rm -f *~
+
+--- /dev/null
++++ b/doc/istgtcontrol.1.in
+@@ -0,0 +1,140 @@
++.TH istgtcontrol 1 "Oct 07, 2011" "istgtcontrol"
++.SH NAME
++istgtcontrol \- istgt iSCSI target command utility
++.SH SYNOPSIS
++.B istgtcontrol
++[options] <command> [<file>]
++.SH DESCRIPTION
++\fBistgtcontrol\fP is a command and control utility for \fBistgt\fP(1).
++It can be used to query and change the status of a local or remote
++\fBistgt\fP instance.
++.PP
++\fBistgtcontrol\fP supports the commands denoted below to interact with
++the \fBistgt\fP instance. By default it connects and authenticates to
++the iSCSI target portal specified in the \fBistgtcontrol.conf\fP
++configuration file and uses CHAP credentials denoted there, if any.
++Both can be overridden by using the respecitve command line arguments.
++.SH COMMANDS
++
++\fBistgtcontrol\fP understands the following commands which can be
++forwarded to \fBistgt\fP:
++
++.TP
++.BI "noop"
++Do not actually do anything, but test responsiveness of the portal and
++test CHAP credentials only.
++.TP
++.BI "version"
++Retrieve the \fBistgt\fP version number providing the iSCSI
++portal \fBistgtcontrol\fP connected to.
++.TP
++.BI "list"
++List all, or the specified targets only, which shared by the portal.
++.TP
++.BI "load"
++Load a new media to the specified unit. This command issues the same
++command as if a drive tray had been closed on a SCSI device.
++
++.TP
++.BI "unload"
++Unload a media from the specified unit. This command issues the same
++command as if the drive tray had been opened from a SCSI device.
++
++.TP
++.BI "change" " \fIfile\fP"
++Change the loaded media by the specified unit. This command is
++equivalent as if a new media (for example a DVD-ROM or tape cartridge) had
++been inserted in the SCSI drive. The "\fIfile\fP" argument is interpreted
++as filename to be loaded.
++
++.TP
++.BI "reset"
++Reset the specified LUN of the portal.
++.TP
++.BI "info"
++Display all connections of the portal
++
++.SH OPTIONS
++.TP
++.BI \-c " \fIconfig\fP"
++Use specified file as configuration file instead of the default file.
++.TP
++
++.BI -h " \fIhost\fP"
++Override the target portal by the specified host name or IP address. This
++defaults to "localhost" if no other host was specified in the
++configuration file.
++.TP
++.BI -p " \fIport\fP"
++Override the target portal port by the specified port number. This defaults
++to "3261" if no other port was specified in the configuration file.
++.TP
++.BI -t " \fItarget\fP"
++Specifies the target IQN which should be affected by the command given.
++There may be a default given in the configuration file. The keyword
++"\fIall\fP" is accepted by some commands and matches all exported volumes.
++.TP
++.BI -l " \fIlun\fP"
++Specifies the target LUN which should be affected by the command given.
++This defaults to "0" unless another default was provided in the configuration
++file.
++.TP
++.BI -f " \fIflags\fP"
++Specifies flags passed to the portal when loading a new media. This
++defaults to "ro". Supported \fIflags\fP are: "ro", "rw", "extend" and
++"dynamic".
++.TP
++.BI -s " \fIsize\fP"
++Specifies the size of the meda to be loaded. The default is to auto-detect the
++media size.
++.TP
++.BI -q
++Quiet mode, supress non-critical outputs.
++.TP
++.BI -v
++Verbose mode, gives more output during operations.
++.TP
++.BI -A " \fImethod\fP"
++Sets the preferred authentication method for logging in to the portal. This
++overrides any method specified in the configuration file. Supported
++methods are either CHAP/Mutual or CHAP/Auto.
++.TP
++.BI -U " \fIuser\fP"
++Sets the user to authenticate on the portal. This overrides any username
++specified in the configuration file.
++.TP
++.BI -S " \fIsecret\fP"
++Set the secret used to authenticate on the portal. This overrides any
++secret specified in the configuration file.
++.TP
++.BI -M " \fImuser\fP"
++Set the mutual authentication user. This overrides any user specified in
++the configuration file.
++.TP
++.BI -R " \fImsecret\fP"
++Set the mutual authentication secret. This overrides any secret
++specified in the configuration file.
++.TP
++.BI -H
++Display a brief usage summary and exit.
++.TP
++.BI -V
++Display the \fBistgtcontrol\fP version number and exit.
++.TP
++
++
++.SH FILES
++.PD 0
++.TP
++.I %%CONFIGDIR%%/istgtcontrol.conf
++Configuration file
++
++.PD
++.SH SEE ALSO
++\fBistgt\fP(1)
++.PD
++.SH AUTHORS
++Daisuke Aoyama <aoyama at peach.ne.jp>
++
++This manual page was written by Arno Töll (<debian at toell.net>) for the Debian
++GNU/kFreeBSD system (but may be used by others).
More information about the Glibc-bsd-commits
mailing list