[pkgsrc/trunk]: pkgsrc/sysutils/mklivecd Update to 0.13.1

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e20309637abb
branches:  trunk
changeset: 498148:e20309637abb
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sat Aug 13 23:35:44 2005 +0000

description:
Update to 0.13.1

Changes:

        * Looks like we'll have to mount the mfs_var tarball
          before mounting the vnd(4) var_db_pkg compressed image.
        * Remove all dirs/files from /usr and /var/db/pkg, saves
          some space.

diffstat:

 sysutils/mklivecd/Makefile          |   4 ++--
 sysutils/mklivecd/files/livecd      |  25 +++++++++++--------------
 sysutils/mklivecd/files/mklivecd.sh |  14 +++++++++-----
 3 files changed, 22 insertions(+), 21 deletions(-)

diffs (121 lines):

diff -r eca0a96d476d -r e20309637abb sysutils/mklivecd/Makefile
--- a/sysutils/mklivecd/Makefile        Sat Aug 13 21:27:02 2005 +0000
+++ b/sysutils/mklivecd/Makefile        Sat Aug 13 23:35:44 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2005/08/11 20:48:55 xtraeme Exp $
+# $NetBSD: Makefile,v 1.24 2005/08/13 23:35:44 xtraeme Exp $
 
-DISTNAME=      mklivecd-0.13.0
+DISTNAME=      mklivecd-0.13.1
 CATEGORIES=    sysutils
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r eca0a96d476d -r e20309637abb sysutils/mklivecd/files/livecd
--- a/sysutils/mklivecd/files/livecd    Sat Aug 13 21:27:02 2005 +0000
+++ b/sysutils/mklivecd/files/livecd    Sat Aug 13 23:35:44 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: livecd,v 1.1 2005/08/11 20:48:55 xtraeme Exp $ 
+# $NetBSD: livecd,v 1.2 2005/08/13 23:35:45 xtraeme Exp $ 
 #
 # Mount mfs directories and unpack the required files
 # before anything.
@@ -17,17 +17,9 @@
 livecd_start()
 {
        if [ -f /stand/usr.zfs ]; then
-               echo -n "=> Mounting compressed images: "
                /rescue/vnconfig -z vnd0 /stand/usr.zfs
                /rescue/mount -r /dev/vnd0a /usr
-               if [ ! -f /stand/var_db_pkg.zfs ]; then
-                       echo "/usr."
-               else
-                       /rescue/vnconfig -z vnd1 /stand/var_db_pkg.zfs
-                       /rescue/mount -r /dev/vnd1a /var/db/pkg
-                       echo "/usr, /var/db/pkg."
-               fi
-       fi
+        fi
 
        echo -n "=> Mounting Memory based filesystems: "
 
@@ -37,14 +29,14 @@
        mount_mfs @MNT_ETC_ARGS@ swap /etc
         echo -n "/etc, "
 
-       mount_mfs @MNT_VAR_ARGS@ swap /var
-        echo -n "/var, "
-
        mount_mfs @MNT_ROOT_ARGS@ swap /root
        echo -n "/root, "
 
        mount_mfs @MNT_TMP_ARGS@ swap /tmp
-       echo "/tmp"
+       echo -n "/tmp, "
+
+       mount_mfs @MNT_VAR_ARGS@ swap /var
+       echo "/var."
 
        @HOME@
        @HOMETAR@
@@ -60,6 +52,11 @@
                 echo "=> $f not unpacked correctly!"
             fi
        done
+
+       if [ -f /stand/var_db_pkg.zfs ]; then
+               /rescue/vnconfig -z vnd1 /stand/var_db_pkg.zfs
+               /rescue/mount -r /dev/vnd1a /var/db/pkg
+       fi
 }
 
 livecd_stop()
diff -r eca0a96d476d -r e20309637abb sysutils/mklivecd/files/mklivecd.sh
--- a/sysutils/mklivecd/files/mklivecd.sh       Sat Aug 13 21:27:02 2005 +0000
+++ b/sysutils/mklivecd/files/mklivecd.sh       Sat Aug 13 23:35:44 2005 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mklivecd.sh,v 1.22 2005/08/11 20:48:55 xtraeme Exp $
+# $NetBSD: mklivecd.sh,v 1.23 2005/08/13 23:35:45 xtraeme Exp $
 #
 # Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -561,7 +561,7 @@
        cat > $ISODIR/etc/rc.d/root <<_EOF_
 #!/bin/sh
 #
-# \$NetBSD: mklivecd.sh,v 1.22 2005/08/11 20:48:55 xtraeme Exp $
+# \$NetBSD: mklivecd.sh,v 1.23 2005/08/13 23:35:45 xtraeme Exp $
 # 
 
 # PROVIDE: root
@@ -803,14 +803,16 @@
             cd $ISODIR
 
             if [ ! -f $ISODIR/stand/usr.zfs ]; then
-                showmsg_n "Creating image of /usr..."
+                showmsg_n "Creating image of /usr... "
                 makefs -t ffs stand/usr.fs usr > /dev/null 2>&1
                 showmsgstring
-                showmsg_n "Compressing image of /usr..."
+                showmsg_n "Compressing image of /usr... "
                 vndcompress stand/usr.fs stand/usr.zfs > /dev/null 2>&1
                 showmsgstring
                 rm stand/usr.fs
-                find $ISODIR/usr -type f | xargs rm -v
+                showmsg_n "Removing /usr... "
+                rm -rf $ISODIR/usr/*
+                showmsgstring
             fi
             if [ -d $ISODIR/var/db/pkg ]; then
                 if [ ! -f stand/var_db_pkg.zfs ]; then
@@ -823,7 +825,9 @@
                         $ISODIR/stand/var_db_pkg.zfs > /dev/null 2>&1
                     showmsgstring
                     rm -f $ISODIR/stand/var_db_pkg.fs
+                    showmsg_n "Removing /var/db/pkg... "
                     rm -rf $ISODIR/var/db/pkg/*
+                    showmsgstring
                     @TAR@ cfzp stand/mfs_var.tgz var
                 fi
             else