diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2006-10-13 16:39:53 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2006-10-13 16:39:53 +0000 |
| commit | 85fbd514cc624d901d53466548181ed60514d88c (patch) | |
| tree | 14c6a3970601270d03d12146cb7e42ced9470aef /sysutils/mklivecd | |
| parent | ad767a057049362542d1358137f4a32d26fbd295 (diff) | |
| download | pkgsrc-85fbd514cc624d901d53466548181ed60514d88c.tar.gz | |
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 (limited to 'sysutils/mklivecd')
| -rw-r--r-- | sysutils/mklivecd/Makefile | 4 | ||||
| -rwxr-xr-x | sysutils/mklivecd/files/mklivecd.sh | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/sysutils/mklivecd/Makefile b/sysutils/mklivecd/Makefile index b8d6d412110..08db3e060f8 100644 --- a/sysutils/mklivecd/Makefile +++ b/sysutils/mklivecd/Makefile @@ -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 --git a/sysutils/mklivecd/files/mklivecd.sh b/sysutils/mklivecd/files/mklivecd.sh index dbc7cc8ce2f..492ad42ec19 100755 --- a/sysutils/mklivecd/files/mklivecd.sh +++ b/sysutils/mklivecd/files/mklivecd.sh @@ -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 @@ do_cdlive() 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 @@ do_cdlive() 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 @@ _EOF_ # # 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 @@ _EOF_ 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 @@ _EOF_ 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 |