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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6315547837ad
branches:  trunk
changeset: 519992:6315547837ad
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Fri Oct 13 14:58:34 2006 +0000

description:
Update to 0.14.2:

* Fix typos in mklivecd.sh that prevented to initialize /home
  and /usr/pkg/etc directories correctly.

diffstat:

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

diffs (87 lines):

diff -r 8796a61e445c -r 6315547837ad sysutils/mklivecd/Makefile
--- a/sysutils/mklivecd/Makefile        Fri Oct 13 14:41:39 2006 +0000
+++ b/sysutils/mklivecd/Makefile        Fri Oct 13 14:58:34 2006 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2006/10/12 15:03:51 xtraeme Exp $
+# $NetBSD: Makefile,v 1.31 2006/10/13 14:58:34 xtraeme Exp $
 
-DISTNAME=      mklivecd-0.14.1
+DISTNAME=      mklivecd-0.14.2
 CATEGORIES=    sysutils
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 8796a61e445c -r 6315547837ad sysutils/mklivecd/files/livecd
--- a/sysutils/mklivecd/files/livecd    Fri Oct 13 14:41:39 2006 +0000
+++ b/sysutils/mklivecd/files/livecd    Fri Oct 13 14:58:34 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: livecd,v 1.4 2006/10/08 19:15:02 xtraeme Exp $ 
+# $NetBSD: livecd,v 1.5 2006/10/13 14:58:34 xtraeme Exp $ 
 #
 # Mount ramfs directories and unpack the required files
 # before anything.
@@ -30,7 +30,7 @@
                /rescue/mkdir /ramfs/$f
                /rescue/mount_null /ramfs/$f /$f
                if [ "$f" = "var" ]; then
-                       echo "/$f"
+                       echo "/$f."
                else
                        echo -n "/$f, "
                fi
diff -r 8796a61e445c -r 6315547837ad sysutils/mklivecd/files/mklivecd.sh
--- a/sysutils/mklivecd/files/mklivecd.sh       Fri Oct 13 14:41:39 2006 +0000
+++ b/sysutils/mklivecd/files/mklivecd.sh       Fri Oct 13 14:58:34 2006 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mklivecd.sh,v 1.27 2006/10/13 13:07:12 xtraeme Exp $
+# $NetBSD: mklivecd.sh,v 1.28 2006/10/13 14:58:34 xtraeme Exp $
 #
 # Copyright (c) 2004-2006 Juan Romero Pardines.
 # All rights reserved.
@@ -555,7 +555,7 @@
        cat > $ISODIR/etc/rc.d/root <<_EOF_
 #!/bin/sh
 #
-# \$NetBSD: mklivecd.sh,v 1.27 2006/10/13 13:07:12 xtraeme Exp $
+# \$NetBSD: mklivecd.sh,v 1.28 2006/10/13 14:58:34 xtraeme Exp $
 # 
 
 # PROVIDE: root
@@ -673,12 +673,12 @@
 
         mkdir -p $ISODIR/ramfs
 
-        SUBST_H_MKDIR="mkdir -p /ramfs/home"
-       SUBST_H_MNT="$MNT_RAMFS_CMD $MNT_RAMFS_ARGS /ramfs/home /home"
-       SUBST_H_UNPACK="@TAR@ xfzp /stand/mfs_home.tgz -C /"
-        SUBST_S_MKDIR="mkdir -p /ramfs/pkg_sysconfdir"
-       SUBST_S_MNT="$MNT_RAMFS_CMD $MNT_RAMFS_ARGS /ramfs/pkg_sysconfdir /usr/pkg/etc" 
-       SUBST_S_UNPACK="@TAR@ xfzp /stand/mfs_pkg_sysconfdir.tgz -C /"
+        SUBST_H_MKDIR="/rescue/mkdir -p /ramfs/home"
+       SUBST_H_MNT="/rescue/mount_null /ramfs/home /home"
+       SUBST_H_UNPACK="/rescue/tar xfzp /stand/mfs_home.tgz -C /"
+        SUBST_S_MKDIR="/rescue/mkdir -p /ramfs/pkg_sysconfdir"
+       SUBST_S_MNT="/rescue/mount_null /ramfs/pkg_sysconfdir /usr/pkg/etc" 
+       SUBST_S_UNPACK="/rescue/tar xfzp /stand/mfs_pkg_sysconfdir.tgz -C /"
 
        sed -e "s|@MNT_RAMFS_ARGS@|$MNT_RAMFS_ARGS|g" \
             -e "s|@MNT_RAMFS_CMD@|$MNT_RAMFS_CMD|g" \
@@ -702,7 +702,7 @@
  
        if [ -d $ISODIR/home ]; then
            sed -e "s|@HOME_MKDIR@|$SUBST_H_MKDIR|" \
-                -e "s|@HOME_MOUNT@|$SUBST_H_MOUNT|" \
+                -e "s|@HOME_MOUNT@|$SUBST_H_MNT|" \
                 -e "s|@HOME_UNPACK@|$SUBST_H_UNPACK|" \
                $ISODIR/etc/rc.d/livecd > $ISODIR/etc/rc.d/livecd.f
            mv $ISODIR/etc/rc.d/livecd.f $ISODIR/etc/rc.d/livecd
@@ -720,7 +720,7 @@
                $PKG_SYSCONFDIR >/dev/null 2>&1
            showmsgstring
            sed -e "s|@USRPKGETC_MKDIR@|$SUBST_S_MKDIR|" \
-                -e "s|@USRPKGETC_MOUNT@|$SUBST_S_MOUNT|" \
+                -e "s|@USRPKGETC_MOUNT@|$SUBST_S_MNT|" \
                 -e "s|@USRPKGETC_UNPACK@|$SUBST_S_UNPACK|" \
                $ISODIR/etc/rc.d/livecd > $ISODIR/etc/rc.d/livecd.f
              mv $ISODIR/etc/rc.d/livecd.f $ISODIR/etc/rc.d/livecd