From 7d9e2e47da8a6dc37ae36ffeafce9677822c9359 Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme@pkgsrc.org>
Date: Wed, 30 Mar 2005 14:23:04 +0000
Subject: 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@.
---
 sysutils/mklivecd/files/mklivecd.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'sysutils/mklivecd/files')

diff --git a/sysutils/mklivecd/files/mklivecd.sh b/sysutils/mklivecd/files/mklivecd.sh
index c9ab2e7f477..7c87a27d877 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.20 2005/03/30 14:23:04 xtraeme 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.20 2005/03/30 14:23:04 xtraeme 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 \
-- 
cgit v1.2.3