add an option to allow logging the output of "mkisofs -v -v" to a file.

This provides the required information for some "on the fly" iso image
generation on an ftp server.  Requested by Todd Vierling.

bump rev to 1.3.

3 files changed, 24 insertions, 13 deletions

diff --git a/pkgtools/cdpack/Makefile b/pkgtools/cdpack/Makefile
index 6de6b75fd0a..8604c3dfa4e 100644
--- a/pkgtools/cdpack/Makefile
+++ b/pkgtools/cdpack/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2001/06/23 04:08:04 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2001/06/24 21:46:33 dmcmahill Exp $
 #
 
-DISTNAME=	cdpack-1.2
+DISTNAME=	cdpack-1.3
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/cdpack/files/cdpack.1 b/pkgtools/cdpack/files/cdpack.1
index bf561728531..1859327dfd6 100644
--- a/pkgtools/cdpack/files/cdpack.1
+++ b/pkgtools/cdpack/files/cdpack.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: cdpack.1,v 1.4 2001/06/23 04:08:04 dmcmahill Exp $
+.\" $NetBSD: cdpack.1,v 1.5 2001/06/24 21:46:34 dmcmahill Exp $
 .\"
 .\" Copyright (c) 2001 Dan McMahill, All rights reserved.
 .\"
@@ -37,8 +37,10 @@
 .Nd produce multi-CD binary package images
 .Sh SYNOPSIS
 .Nm ""
+.Op -l logfile
 .Op -nRvV
-.Op -x extra_directory
+.Op -x common_directory
+.Op -X extras_directory
 .Ar packages_directory
 .Ar cd_image_directory
 .Sh DESCRIPTION
@@ -58,10 +60,13 @@ directory
 .Ar cd_image_directory
 is used as a staging area and the final ISO 9660 images are left in
 that directory.  A file, 
-.Ar .index
-, which lists the contents of each CD will be left in the root 
+.Ar .index ,
+which lists the contents of each CD will be left in the root 
 directory of each CD image.
 .Bl -tag -width "-x directory "
+.It Fl l Ar logfile
+Log the output of mkisofs -v -v to the file
+.Ar logfile .
 .It Fl n
 Do not duplicate packages in order to prevent inter-CD dependencies.
 The default without the
@@ -80,8 +85,8 @@ CD-ROM's.  In this fashion, a package on CD number n
 will have all of its dependencies on CD numbers 1 through n
 .It Fl R
 Generate a file,
-.Ar README.txt
-, which will be placed in the root directory of each CD image.  This
+.Ar README.txt ,
+which will be placed in the root directory of each CD image.  This
 README file contains a small amount of information about the contents
 of the CD set.
 .It Fl v
diff --git a/pkgtools/cdpack/files/cdpack.sh b/pkgtools/cdpack/files/cdpack.sh
index f51af1679d3..f0490efa74c 100755
--- a/pkgtools/cdpack/files/cdpack.sh
+++ b/pkgtools/cdpack/files/cdpack.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: cdpack.sh,v 1.3 2001/06/23 04:08:04 dmcmahill Exp $
+# $NetBSD: cdpack.sh,v 1.4 2001/06/24 21:46:34 dmcmahill Exp $
 #
 # Copyright (c) 2001 Dan McMahill, All rights reserved.
 #
@@ -55,7 +55,7 @@ mkdir $TMP
 
 usage(){
 	echo "$prog - generates ISO9660 images for a multi-cd binary package collection"
-	echo "Usage:      $prog [-n] [-R] [-v] [-V] [-x dir] [-X dir] packages_directory cdimage_directory"
+	echo "Usage:      $prog [-l logfile] [-n] [-R] [-v] [-V] [-x dir] [-X dir] packages_directory cdimage_directory"
 	echo "Example:    $prog /usr/pkgsrc/packages/netbsd-1.5/alpha/All  /images/netbsd-1.5/alpha"
 	echo "Please refer to the manual page for complete documentation."
 }
@@ -85,12 +85,18 @@ VERBOSE=no
 VERSION=no
 USE_XTRA=no
 USE_OTHERS=no
+mkisofslog=/dev/null
 
 while
     test -n "$1"
 do
     case "$1"
     in
+	# log file for the output of mkisofs -v -v
+	-l) mkisofslog=$2
+	    shift 2
+	    ;;
+
 	# do not duplicate packages to avoid inter-CD dependencies
 	-n) DUP=no
 	    shift
@@ -415,7 +421,7 @@ fi
 #
 volid=PackagesCD
 #mkisofs_flags="-f -l -r -J -L -volset-size $ncds -V $volid "
-mkisofs_flags="-f -l -r -J -L "
+mkisofs_flags="-v -v -f -l -r -J -L "
 
 echo "Creating the ISO images"
 cdn=1
@@ -424,8 +430,8 @@ do
     echo "----------- $cdname ----------"
     #mkisofs_flags2=" -volset-ID $cdname -volset-seqno $cdn "
     mkisofs_flags2=" -V ${volid}$cdn "
-    echo "(cd ${cddir} && mkisofs $mkisofs_flags $mkisofs_flags2 -o ${cdname}.iso $cdname)"
-    ( cd ${cddir} && mkisofs $mkisofs_flags $mkisofs_flags2 -o ${cdname}.iso $cdname )
+    echo "( cd ${cddir} && mkisofs $mkisofs_flags $mkisofs_flags2 -o ${cdname}.iso $cdname >> $mkisofslog 2>&1)"
+    ( cd ${cddir} && mkisofs $mkisofs_flags $mkisofs_flags2 -o ${cdname}.iso $cdname >> $mkisofslog 2>&1)
     if [ $? != 0 ]; then
 	echo "mkisofs failed"
 	clean_and_exit