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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/07dbe6bc66da
branches:  trunk
changeset: 522074:07dbe6bc66da
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sat Dec 02 01:04:47 2006 +0000

description:
Update to 0.14.4:

Fixed a bug in the MULTIBOOT case with kernels like GENERIC.MPACPI.
These kind of kernels do not define "options MULTIBOOT" because
they include another config file that has defined the option.

Rather than using grep -q MULTIBOOT on the kernel config file,
use config(1) -x <kernel> and check if MULTIBOOT is set.

diffstat:

 sysutils/mklivecd/Makefile          |  4 ++--
 sysutils/mklivecd/files/mklivecd.sh |  8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (49 lines):

diff -r c09c09ed35ee -r 07dbe6bc66da sysutils/mklivecd/Makefile
--- a/sysutils/mklivecd/Makefile        Fri Dec 01 21:17:08 2006 +0000
+++ b/sysutils/mklivecd/Makefile        Sat Dec 02 01:04:47 2006 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2006/10/13 16:39:53 xtraeme Exp $
+# $NetBSD: Makefile,v 1.33 2006/12/02 01:04:47 xtraeme Exp $
 
-DISTNAME=      mklivecd-0.14.3
+DISTNAME=      mklivecd-0.14.4
 CATEGORIES=    sysutils
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r c09c09ed35ee -r 07dbe6bc66da sysutils/mklivecd/files/mklivecd.sh
--- a/sysutils/mklivecd/files/mklivecd.sh       Fri Dec 01 21:17:08 2006 +0000
+++ b/sysutils/mklivecd/files/mklivecd.sh       Sat Dec 02 01:04:47 2006 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mklivecd.sh,v 1.29 2006/10/13 16:39:53 xtraeme Exp $
+# $NetBSD: mklivecd.sh,v 1.30 2006/12/02 01:04:47 xtraeme Exp $
 #
 # Copyright (c) 2004-2006 Juan Romero Pardines.
 # All rights reserved.
@@ -557,7 +557,7 @@
        cat > $ISODIR/etc/rc.d/root <<_EOF_
 #!/bin/sh
 #
-# \$NetBSD: mklivecd.sh,v 1.29 2006/10/13 16:39:53 xtraeme Exp $
+# \$NetBSD: mklivecd.sh,v 1.30 2006/12/02 01:04:47 xtraeme Exp $
 # 
 
 # PROVIDE: root
@@ -887,13 +887,15 @@
         # Detect if we are running a MULTIBOOT kernel.
         #
         if [ -f $ISODIR/$GRUB_BOOTDIR/menu.lst -a -f $WORKDIR/$BOOTKERN ]; then
-            grep -q MULTIBOOT $WORKDIR/$BOOTKERN
+            gunzip $ISODIR/$GRUB_BOOTDIR/$BOOTKERN
+            config -x $ISODIR/$GRUB_BOOTDIR/$BOOTKERN | grep -q MULTIBOOT
             if [ "$?" -eq 0 ]; then
                 showmsg "Applying fix for MULTIBOOT kernel..."
                 sed -e "s|\--type=netbsd||g" $ISODIR/boot/grub/menu.lst > \
                     $ISODIR/boot/grub/menu.lst.in
                 mv $ISODIR/boot/grub/menu.lst.in $ISODIR/boot/grub/menu.lst
             fi
+            gzip -9 $ISODIR/$GRUB_BOOTDIR/$BOOTKERN
         fi
 
         _do_real_iso_image()