[pkgsrc/trunk]: pkgsrc/sysutils/mklivecd Update to 0.12.0.

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e1dce974b073
branches:  trunk
changeset: 497497:e1dce974b073
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Fri Jul 29 12:13:01 2005 +0000

description:
Update to 0.12.0.

Changes:

        o cdboot support on NetBSD >=4.0 (-current).
        o Availability to choose the bootloader through a new option:
          USE_GNU_GRUB (by default yes).
        o When using GRUB as the bootloader, it is possible to build
          and install multiple kernels with the target "kernel", it
          will install the kernels into the ISO image and the menu.lst
          file will be modified automatically, see MULTIPLE_KERNELS
          (mklivecd(8)).
        o Various misc fixes.
        o Now /dev uses optimum values for not wasting space.
        o Added -k flag, that accepts a kernel as argument. To build
          an additional kernel without looking at the config file.

diffstat:

 sysutils/mklivecd/DESCR             |     2 +-
 sysutils/mklivecd/Makefile          |    12 +-
 sysutils/mklivecd/files/mfs_rcd     |    18 +-
 sysutils/mklivecd/files/mklivecd.8  |   285 +++++--
 sysutils/mklivecd/files/mklivecd.sh |  1276 +++++++++++++++++++---------------
 5 files changed, 936 insertions(+), 657 deletions(-)

diffs (truncated from 1953 to 300 lines):

diff -r 3d229f7237a9 -r e1dce974b073 sysutils/mklivecd/DESCR
--- a/sysutils/mklivecd/DESCR   Fri Jul 29 06:06:57 2005 +0000
+++ b/sysutils/mklivecd/DESCR   Fri Jul 29 12:13:01 2005 +0000
@@ -1,2 +1,2 @@
 mklivecd is a simple shell script that allows you to build a custom
-NetBSD LiveCD on i386-based machines.
+NetBSD/i386 Live CD-ROM/DVD-ROM with a command line interface.
diff -r 3d229f7237a9 -r e1dce974b073 sysutils/mklivecd/Makefile
--- a/sysutils/mklivecd/Makefile        Fri Jul 29 06:06:57 2005 +0000
+++ b/sysutils/mklivecd/Makefile        Fri Jul 29 12:13:01 2005 +0000
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.19 2005/05/16 01:32:23 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/07/29 12:13:01 xtraeme Exp $
 
-DISTNAME=      mklivecd-0.11
+DISTNAME=      mklivecd-0.12.0
 CATEGORIES=    sysutils
 MASTER_SITES=  # empty
 DISTFILES=     # empty
 
 MAINTAINER=    xtraeme%NetBSD.org@localhost
-COMMENT=       Build a NetBSD i386 Live CD via command line
+COMMENT=       Make your own NetBSD/i386 Live CD-ROM/DVD-ROM
 
 DEPENDS+=      {cdrecord,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrecord
-DEPENDS+=      grub>=0.96:../../sysutils/grub
+#DEPENDS+=     grub>=0.96:../../sysutils/grub
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
@@ -27,7 +27,7 @@
 FILES=     KERN-LIVECD personal_config
 
 do-install:
-.for f in mfs_rcd mklivecd.sh
+.for f in mfs_rcd mklivecd.sh mklivecd.8
        @${SED} -e "s,@PREFIX@,${PREFIX},g" \
                -e "s,@LOCALBASE@,${LOCALBASE},g" \
                -e "s,@TAR@,${TAR},g" \
@@ -36,7 +36,7 @@
 .endfor
        ${INSTALL_DATA_DIR} ${PREFIX}/share/mklivecd
        ${INSTALL_SCRIPT} ${WRKDIR}/mklivecd.sh ${PREFIX}/sbin/mklivecd
-       ${INSTALL_MAN} ${FILESDIR}/mklivecd.8 ${PREFIX}/man/man8
+       ${INSTALL_MAN} ${WRKDIR}/mklivecd.8 ${PREFIX}/man/man8
        ${INSTALL_DATA} ${WRKDIR}/mfs_rcd ${PREFIX}/share/mklivecd
 .for F in ${FILES}
        ${INSTALL_DATA} ${FILESDIR}/${F} ${PREFIX}/share/mklivecd
diff -r 3d229f7237a9 -r e1dce974b073 sysutils/mklivecd/files/mfs_rcd
--- a/sysutils/mklivecd/files/mfs_rcd   Fri Jul 29 06:06:57 2005 +0000
+++ b/sysutils/mklivecd/files/mfs_rcd   Fri Jul 29 12:13:01 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: mfs_rcd,v 1.4 2004/10/29 17:47:30 xtraeme Exp $ 
+# $NetBSD: mfs_rcd,v 1.5 2005/07/29 12:13:01 xtraeme Exp $ 
 #
-# Mount mfs directories and unpack the required file
+# Mount mfs directories and unpack the required files
 # before anything.
 
 # PROVIDE: LiveCD
@@ -16,11 +16,15 @@
 
 mfsrc_start()
 {
-       echo "=> Mounting Memory based filesystems..."
+       echo -n "=> Mounting Memory based filesystems: "
        mount_mfs @MNT_DEV_ARGS@ swap /dev
+        echo -n "/dev, "
        mount_mfs @MNT_ETC_ARGS@ swap /etc
+        echo -n "/etc, "
        mount_mfs @MNT_VAR_ARGS@ swap /var
+        echo -n "/root, "
        mount_mfs @MNT_ROOT_ARGS@ swap /root
+        echo "/tmp."
        mount_mfs @MNT_TMP_ARGS@ swap /tmp
        @HOME@
        @HOMETAR@
@@ -29,9 +33,13 @@
 
        for f in mfs_dev mfs_etc mfs_var mfs_root
        do
-           @TAR@ xfzp /stand/$f.tgz -C / 
+           @TAR@ xfzp /stand/$f.tgz -C / > /dev/null 2>&1
+            if [ "$?" -eq 0 ]; then
+                echo "=> $f unpacked successfully."
+            else
+                echo "=> $f not unpacked correctly!"
+            fi
        done
-       echo "=> Finished successfully."
 }
 
 mfsrc_stop()
diff -r 3d229f7237a9 -r e1dce974b073 sysutils/mklivecd/files/mklivecd.8
--- a/sysutils/mklivecd/files/mklivecd.8        Fri Jul 29 06:06:57 2005 +0000
+++ b/sysutils/mklivecd/files/mklivecd.8        Fri Jul 29 12:13:01 2005 +0000
@@ -1,7 +1,8 @@
-.\" $NetBSD: mklivecd.8,v 1.10 2005/01/11 02:25:21 xtraeme Exp $
+.\" $NetBSD: mklivecd.8,v 1.11 2005/07/29 12:13:01 xtraeme Exp $
 .\"
-.\" mklivecd - Build a NetBSD Live CD for i386 machines
-.\" Copyright (c) 2004 Juan RP <xtraeme%NetBSD.org@localhost>
+.\" mklivecd - Make your own NetBSD/i386 Live CD-ROM/DVD-ROM
+.\"
+.\" Copyright (c) 2004, 2005 Juan Romero Pardines  <xtraeme%NetBSD.org@localhost>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -27,26 +28,42 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 11, 2005
+.Dd July 25, 2005
 .Dt MKLIVECD 8
 .Os
 .Sh NAME
 .Nm mklivecd
-.Nd build a
+.Nd Make your own
 .Nx
-Live CD for i386 machines
+/ i386 Live CD-ROM/DVD-ROM
 .Sh SYNOPSIS
 .Nm
 .Fl v
 .Fl c Ar conf_file
+.Fl k Ar kernel
 .Ar target
 .Sh DESCRIPTION
 .Nm
 allows you to build your own
 .Nx
-Live CD, so you don't need to install
+Live CD/DVD, so you don't need to install
 .Nx
-to any disk, because it will run directly from the CD-ROM.
+to any disk, because it will run directly from the CD-ROM/DVD-ROM.
+.Pp
+To choose different kernels when booting from the CD-ROM/DVD-ROM,
+two options for the bootloader are provided since version
+.Pa 0.12.0 :
+.Pa the GNU Grub bootloader
+or the
+.Nx
+cdboot bootloader (since 
+.Nx
+4.0). By default it will use the first option:
+.Pa the GNU Grub bootloader .
+You may want to change this by changing the option
+.Pa USE_GNU_GRUB
+to
+.Sy no .
 .Pp
 The following options are recognized:
 .Bl -tag -width XcXconf_file
@@ -57,6 +74,14 @@
 Example:
 .Fl c Ar foo.conf .
 .El
+.Bl -tag -width XkXkernel
+.It Fl k Ar kernel
+Overrides the
+.Ar BOOTKERN
+value specified in the configuration file,
+.Ar KERNEL_NAME
+will be modified automatically too.
+.El
 .Bl -tag -width XvX
 .It Fl v
 Show more useful messages.
@@ -76,15 +101,32 @@
 .Ar config
 target.
 .Bl -tag -width 15n -offset indent
-.It SOURCEDIR
-The
-.Nx
-source directory.
+.It BASEDIR
+Primary directory used to store the main directories and the final ISO image.
+Defaults to
+.Pa $HOME/livecd .
+.It BASE_SETS_DIR
+The base sets directory.
 Defaults to
-.Pa /usr/src .
+.Pa $HOME/release/binary/sets .
+.It BASE_SETS
+Base sets which will be unpacked into
+.Pa $ISODIR . 
+Sets used by default are:
+.Pa etc.tgz base.tgz comp.tgz text.tgz .
+.It CHROOT_SHELL
+Default shell to use with the chroot target.
+Defaults to
+.Sy /bin/ksh .
+.It ISODIR
+Directory used to store the main
+.Nx 
+base distribution.
+Defaults to
+.Pa $BASEDIR/iso .
 .It PKGSRCDIR
-The
-.Nx
+The 
+.Nx 
 packages collection directory.
 When the
 .Ar chroot
@@ -107,90 +149,27 @@
 The main directory used to store the Makefiles, kernel, example configuration
 files, etc.
 Defaults to
-.Pa $PREFIX/share/mklivecd/ .
-.It BASEDIR
-Primary directory used to store the main directories and the final ISO image.
+.Pa @PREFIX@/share/mklivecd/ .
+.It SOURCEDIR
+The
+.Nx
+source directory.
 Defaults to
-.Pa $HOME/livecd .
+.Pa /usr/src .
 .It WORKDIR
 Directory used to store the object files and kernel built by the target
 .Ql kernel .
 Defaults to
 .Pa $BASEDIR/work .
-.It ISODIR
-Directory used to store the main
-.Nx
-base distribution.
-Defaults to
-.Pa $BASEDIR/iso .
-.It BASE_SETS_DIR
-The base sets directory.
-Defaults to
-.Pa $HOME/release/binary/sets .
-.It X11_SETS_DIR
-The X11 sets directory.
-Defaults to
-.Pa $BASE_SETS_DIR .
-.It BASE_SETS
-Base sets which will be unpacked into
-.Pa $ISODIR .
-Sets used by default are:
-.Pa etc.tgz base.tgz comp.tgz text.tgz .
 .It X11_SETS
 X11 sets which will be unpacked into
 .Pa $ISODIR .
 Sets used by default are:
 .Pa xbase.tgz xcomp.tgz xfont.tgz xserver.tgz .
-.It CHROOT_SHELL
-Default shell to use with the chroot target.
-Defaults to
-.Sy /bin/ksh
-.It ENABLE_X11
-If set to
-.Sy yes
-then X11 sets and configuration files will be unpacked automatically.
-Defaults to
-.Sy no .
-.It MKISOFS_ARGS
-Arguments passed to
-.Xr mkisofs 1
-when creating the
-.Nx
-ISO image.
-Defaults to
-.Sy -nobak -J -R -v .
-.It CDRECORD_ARGS
-Arguments passed to
-.Xr cdrecord 1
-when burning the
-.Nx
-Live CD ISO image.
+.It X11_SETS_DIR
+The X11 sets directory.
 Defaults to
-.Sy -v .
-.It BLANK_BEFORE_BURN
-Used in the
-.Ar burn
-target to blank a CD-RW before burning the
-.Nx
-Live CD ISO image.
-Useful if you use CD-RW.
-Defaults to
-.Sy no .
-.It CDROM_DEVICE
-Used in the target
-.Ar burn
-to specify the CD-ROM device.
-Defaults to
-.Sy 15,1,0 .
-.It PERSONAL_CONFIG
-If set to