diff options
| author | xtraeme <xtraeme> | 2006-12-02 01:04:47 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme> | 2006-12-02 01:04:47 +0000 |
| commit | 14f463d08bf6f356f3d328f594f6a6a02a795b79 (patch) | |
| tree | 8a7d4a4b61eb6455f837793c8f47477a6b7c8c5c | |
| parent | 9a43ae1dd54f1658176a3b6b9abcfa148b744009 (diff) | |
| download | pkgsrc-14f463d08bf6f356f3d328f594f6a6a02a795b79.tar.gz | |
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.
| -rw-r--r-- | sysutils/mklivecd/Makefile | 4 | ||||
| -rwxr-xr-x | sysutils/mklivecd/files/mklivecd.sh | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sysutils/mklivecd/Makefile b/sysutils/mklivecd/Makefile index 08db3e060f8..cc121de265c 100644 --- a/sysutils/mklivecd/Makefile +++ b/sysutils/mklivecd/Makefile @@ -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 --git a/sysutils/mklivecd/files/mklivecd.sh b/sysutils/mklivecd/files/mklivecd.sh index 492ad42ec19..4c49b924c0b 100755 --- a/sysutils/mklivecd/files/mklivecd.sh +++ b/sysutils/mklivecd/files/mklivecd.sh @@ -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 @@ do_cdlive() 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 @@ _EOF_ # 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() |