kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 0.14.4:

Browse source 
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.
This commit is contained in:
xtraeme 2006-12-02 01:04:47 +00:00
parent 6fee6d8ef6
commit ccb6d5f49f
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sysutils/mklivecd/Makefile
View file

@ -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

8
sysutils/mklivecd/files/mklivecd.sh
View file

@ -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()