diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2006-10-12 15:03:51 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2006-10-12 15:03:51 +0000 |
| commit | 80e47f56a9a2cf11d3de522a36ed3b9360ef6777 (patch) | |
| tree | d0726a993551a969a8911834d23104134f15bdf8 | |
| parent | b299a399949559b5d164df06ba48c7f841fbc5f5 (diff) | |
| download | pkgsrc-80e47f56a9a2cf11d3de522a36ed3b9360ef6777.tar.gz | |
Update to 0.14.1:
* Don't modify menu.lst if it's not available.
* Update some comments.
| -rw-r--r-- | sysutils/mklivecd/Makefile | 4 | ||||
| -rwxr-xr-x | sysutils/mklivecd/files/mklivecd.sh | 30 |
2 files changed, 19 insertions, 15 deletions
diff --git a/sysutils/mklivecd/Makefile b/sysutils/mklivecd/Makefile index f84dd766074..da52c7372ed 100644 --- a/sysutils/mklivecd/Makefile +++ b/sysutils/mklivecd/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.29 2006/10/08 19:08:38 xtraeme Exp $ +# $NetBSD: Makefile,v 1.30 2006/10/12 15:03:51 xtraeme Exp $ -DISTNAME= mklivecd-0.14 +DISTNAME= mklivecd-0.14.1 CATEGORIES= sysutils MASTER_SITES= # empty DISTFILES= # empty diff --git a/sysutils/mklivecd/files/mklivecd.sh b/sysutils/mklivecd/files/mklivecd.sh index 905fbe6144c..1fe4e73f343 100755 --- a/sysutils/mklivecd/files/mklivecd.sh +++ b/sysutils/mklivecd/files/mklivecd.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: mklivecd.sh,v 1.25 2006/10/08 19:08:38 xtraeme Exp $ +# $NetBSD: mklivecd.sh,v 1.26 2006/10/12 15:03:51 xtraeme Exp $ # # Copyright (c) 2004-2006 Juan Romero Pardines. # All rights reserved. @@ -253,8 +253,10 @@ do_conf_reset() copy_bootfiles() { + # + # GNU GRUB. + # if [ "$USE_GNU_GRUB" = "yes" ]; then - # GNU Grub selected. [ ! -d $ISODIR/$GRUB_BOOTDIR ] && mkdir -p $ISODIR/$GRUB_BOOTDIR for f in $GRUB_FILES do @@ -271,7 +273,9 @@ copy_bootfiles() fi done else - # We are using cdboot. + # + # NetBSD cd9660 bootloader (bootxx_cd9660) + # if [ -f ${CDBOOT_DIR}/${CDBOOT_IMG} ]; then cp -f ${CDBOOT_DIR}/${CDBOOT_IMG} $ISODIR else @@ -345,7 +349,6 @@ do_build_kernels() if [ "$USE_GNU_GRUB" = "yes" ]; then cp $WORKDIR/$kernname/netbsd $ISODIR/$GRUB_BOOTDIR/$bootkern else - # We are using cdboot. cp $WORKDIR/$kernname/netbsd $ISODIR/$bootkern fi [ -n "$verbose_mode" ] && \ @@ -433,8 +436,7 @@ do_cdlive() config -s $SOURCEDIR/sys -b $WORKDIR/$KERNEL_NAME \ $BOOTKERN cd $KERNEL_NAME - make depend - make COPTS="-Os" # Don't use additional flags + make depend && make if [ "$?" -eq 0 ]; then copy_bootfiles showmsg_n "Compressing kernel $BOOTKERN..." @@ -553,7 +555,7 @@ do_cdlive() cat > $ISODIR/etc/rc.d/root <<_EOF_ #!/bin/sh # -# \$NetBSD: mklivecd.sh,v 1.25 2006/10/08 19:08:38 xtraeme Exp $ +# \$NetBSD: mklivecd.sh,v 1.26 2006/10/12 15:03:51 xtraeme Exp $ # # PROVIDE: root @@ -882,12 +884,14 @@ _EOF_ # # Detect if we are running a MULTIBOOT kernel. # - grep -q MULTIBOOT $WORKDIR/$BOOTKERN - 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 + if [ -f $ISODIR/boot/grub/menu.lst ]; then + grep -q MULTIBOOT $WORKDIR/$BOOTKERN + 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 fi _do_real_iso_image() |