diff options
| author | salo <salo@pkgsrc.org> | 2005-03-31 15:10:30 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2005-03-31 15:10:30 +0000 |
| commit | 97232dfb526a491954708a4dd42cd178b3e36a6f (patch) | |
| tree | 81dc8b165ba9e086cd00925b0a19d11b2f7258e2 /sysutils | |
| parent | 4016d968b5026388fac7ffaab293e8fffa103a07 (diff) | |
| download | pkgsrc-97232dfb526a491954708a4dd42cd178b3e36a6f.tar.gz | |
Pullup ticket 404 - requested by Juan Romero Pardines
usability fix for mklivecd
Revisions pulled up:
- pkgsrc/sysutils/mklivecd/Makefile 1.17
- pkgsrc/sysutils/mklivecd/files/mklivecd.sh 1.20
Module Name: pkgsrc
Committed By: xtraeme
Date: Wed Mar 30 14:23:04 UTC 2005
Modified Files:
pkgsrc/sysutils/mklivecd: Makefile
pkgsrc/sysutils/mklivecd/files: mklivecd.sh
Log Message:
Update to 0.11
* grub changed the directory for the stage files, this was
changed in 0.96, require at least this version.
* Don't remove the work directories when the pkgsrc or
distfiles are still mounted in the clean target.
Patch submitted by Mike M. Volokhov on tech-pkg@.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/mklivecd/Makefile | 7 | ||||
| -rwxr-xr-x | sysutils/mklivecd/files/mklivecd.sh | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/sysutils/mklivecd/Makefile b/sysutils/mklivecd/Makefile index 36f6375d128..b8cc77383af 100644 --- a/sysutils/mklivecd/Makefile +++ b/sysutils/mklivecd/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.16 2005/03/16 16:37:37 xtraeme Exp $ +# $NetBSD: Makefile,v 1.16.2.1 2005/03/31 15:10:30 salo Exp $ -DISTNAME= mklivecd-0.10 -PKGREVISION= 1 +DISTNAME= mklivecd-0.11 CATEGORIES= sysutils MASTER_SITES= # empty DISTFILES= # empty @@ -10,7 +9,7 @@ MAINTAINER= xtraeme@NetBSD.org COMMENT= Build a NetBSD i386 Live CD via command line DEPENDS+= {cdrecord,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrecord -DEPENDS+= grub>=0.95:../../sysutils/grub +DEPENDS+= grub>=0.96:../../sysutils/grub PKG_INSTALLATION_TYPES= overwrite pkgviews diff --git a/sysutils/mklivecd/files/mklivecd.sh b/sysutils/mklivecd/files/mklivecd.sh index c9ab2e7f477..0aa9f8277bf 100755 --- a/sysutils/mklivecd/files/mklivecd.sh +++ b/sysutils/mklivecd/files/mklivecd.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: mklivecd.sh,v 1.19 2005/03/16 16:37:38 xtraeme Exp $ +# $NetBSD: mklivecd.sh,v 1.19.2.1 2005/03/31 15:10:31 salo Exp $ # # Copyright (c) 2004, 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -257,7 +257,7 @@ do_cdlive() for f in $GRUB_FILES do if [ ! -f $ISODIR/$BOOTDIR/$f ]; then - cp @PREFIX@/share/grub/@MACHINE_ARCH@-/$f \ + cp @PREFIX@/lib/grub/@MACHINE_ARCH@-/$f \ $ISODIR/$BOOTDIR [ "$verbose_mode" = "on" ] && \ showmsg "Copying $f into $ISODIR/$BOOTDIR." @@ -374,7 +374,7 @@ _EOF_ cat > $ISODIR/etc/rc.d/root <<_EOF_ #!/bin/sh # -# \$NetBSD: mklivecd.sh,v 1.19 2005/03/16 16:37:38 xtraeme Exp $ +# \$NetBSD: mklivecd.sh,v 1.19.2.1 2005/03/31 15:10:31 salo Exp $ # # PROVIDE: root @@ -589,6 +589,10 @@ _EOF_ fi ;; clean) + if [ -f $pkgsrc_mntstat -o -f $pkgsrcdist_mntstat ]; then + showmsg "The pkgsrc directories still in use! Exiting." + bye 1 + fi showmsg "Cleaning WORKDIR: $WORKDIR" rm -rf $WORKDIR for F in bin dev etc lib libexec mnt rescue \ |