[pkgsrc/trunk]: pkgsrc/sysutils/mklivecd Update to 0.14.3 (sigh):

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b2a9ed2a2fa4
branches:  trunk
changeset: 519996:b2a9ed2a2fa4
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Fri Oct 13 16:39:53 2006 +0000

description:
Update to 0.14.3 (sigh):

* Fix a problem in the 'iso' target removing permissions in all files.
* Don't do the MULTIBOOT fix if the kernel is not available in WORKDIR.

diffstat:

 sysutils/mklivecd/Makefile          |   4 ++--
 sysutils/mklivecd/files/mklivecd.sh |  11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diffs (67 lines):

diff -r 99d2e9269329 -r b2a9ed2a2fa4 sysutils/mklivecd/Makefile
--- a/sysutils/mklivecd/Makefile        Fri Oct 13 16:39:13 2006 +0000
+++ b/sysutils/mklivecd/Makefile        Fri Oct 13 16:39:53 2006 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2006/10/13 14:58:34 xtraeme Exp $
+# $NetBSD: Makefile,v 1.32 2006/10/13 16:39:53 xtraeme Exp $
 
-DISTNAME=      mklivecd-0.14.2
+DISTNAME=      mklivecd-0.14.3
 CATEGORIES=    sysutils
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 99d2e9269329 -r b2a9ed2a2fa4 sysutils/mklivecd/files/mklivecd.sh
--- a/sysutils/mklivecd/files/mklivecd.sh       Fri Oct 13 16:39:13 2006 +0000
+++ b/sysutils/mklivecd/files/mklivecd.sh       Fri Oct 13 16:39:53 2006 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mklivecd.sh,v 1.28 2006/10/13 14:58:34 xtraeme Exp $
+# $NetBSD: mklivecd.sh,v 1.29 2006/10/13 16:39:53 xtraeme Exp $
 #
 # Copyright (c) 2004-2006 Juan Romero Pardines.
 # All rights reserved.
@@ -546,6 +546,8 @@
        echo "inetd=no";                                    \
        echo "ntpdate=no";                                  \
        echo "savecore=no";                                 \
+       echo "ldconfig=no";                                 \
+       echo "clear_tmp=no";                                \
        ) >> $ISODIR/etc/rc.conf
 
        # /etc/rc.d/root could umount the mfs directories, 
@@ -555,7 +557,7 @@
        cat > $ISODIR/etc/rc.d/root <<_EOF_
 #!/bin/sh
 #
-# \$NetBSD: mklivecd.sh,v 1.28 2006/10/13 14:58:34 xtraeme Exp $
+# \$NetBSD: mklivecd.sh,v 1.29 2006/10/13 16:39:53 xtraeme Exp $
 # 
 
 # PROVIDE: root
@@ -884,7 +886,7 @@
         #
         # Detect if we are running a MULTIBOOT kernel.
         #
-        if [ -f $ISODIR/$GRUB_BOOTDIR/menu.lst ]; then
+        if [ -f $ISODIR/$GRUB_BOOTDIR/menu.lst -a -f $WORKDIR/$BOOTKERN ]; then
             grep -q MULTIBOOT $WORKDIR/$BOOTKERN
             if [ "$?" -eq 0 ]; then
                 showmsg "Applying fix for MULTIBOOT kernel..."
@@ -901,7 +903,6 @@
                     echo "=> Removing $IMAGE_NAME.iso..."
                 rm $BASEDIR/$IMAGE_NAME.iso
             fi
-            [ -d $ISODIR/$BOOTDIR ] && chown -R root:wheel $ISODIR/$BOOTDIR
 
             if [ ! -f $ISODIR/stand/mfs_etc.tgz ]; then
                 showmsg "Cannot find mfs_etc.tgz file."
@@ -920,6 +921,8 @@
 
             showmsg_n "Creating ISO CD9660 image..."
             if [ "$USE_GNU_GRUB" = "yes" ]; then
+                [ -d $ISODIR/$GRUB_BOOTDIR ] && \
+                    chown -R root:wheel $ISODIR/$GRUB_BOOTDIR
                 $MKISOFS_BIN $MKISOFS_FIXED_ARGS $GRUB_BOOT_ARGS $MKISOFS_ARGS \
                -b $GRUB_BOOTDIR/$GRUB_BOOTIMAGE \
                -o $BASEDIR/$IMAGE_NAME.iso $ISODIR > /dev/null 2>&1