diff options
| author | xtraeme <xtraeme> | 2006-10-13 13:07:12 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme> | 2006-10-13 13:07:12 +0000 |
| commit | f084d2ab1488932e424228c0e7cf2f2441fedc68 (patch) | |
| tree | 63a3facdd10ed60f0a7d4ab11501a210c56b3762 /sysutils | |
| parent | 307d7781720f6185cf42766b73191e50626750fa (diff) | |
| download | pkgsrc-f084d2ab1488932e424228c0e7cf2f2441fedc68.tar.gz | |
* Fix typo in mklivecd(8).
* In the clean target check for $packages_mntstat too.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/mklivecd/files/mklivecd.8 | 4 | ||||
| -rwxr-xr-x | sysutils/mklivecd/files/mklivecd.sh | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sysutils/mklivecd/files/mklivecd.8 b/sysutils/mklivecd/files/mklivecd.8 index b0ae08420b1..6391d50b3f8 100644 --- a/sysutils/mklivecd/files/mklivecd.8 +++ b/sysutils/mklivecd/files/mklivecd.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: mklivecd.8,v 1.13 2006/10/08 19:08:38 xtraeme Exp $ +.\" $NetBSD: mklivecd.8,v 1.14 2006/10/13 13:07:12 xtraeme Exp $ .\" .\" mklivecd - Make your own NetBSD/i386 Live CD-ROM/DVD-ROM .\" @@ -503,7 +503,7 @@ It is not perfect but at least it does its task correctly. .Sh SEE ALSO .Xr packages 7 , .Xr mount_mfs 8 , -.Xr mount_null 8, +.Xr mount_null 8 , .Xr mount_tmpfs 8 .Sh AUTHORS The diff --git a/sysutils/mklivecd/files/mklivecd.sh b/sysutils/mklivecd/files/mklivecd.sh index 1fe4e73f343..b453c9b5f87 100755 --- a/sysutils/mklivecd/files/mklivecd.sh +++ b/sysutils/mklivecd/files/mklivecd.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: mklivecd.sh,v 1.26 2006/10/12 15:03:51 xtraeme Exp $ +# $NetBSD: mklivecd.sh,v 1.27 2006/10/13 13:07:12 xtraeme Exp $ # # Copyright (c) 2004-2006 Juan Romero Pardines. # All rights reserved. @@ -555,7 +555,7 @@ do_cdlive() cat > $ISODIR/etc/rc.d/root <<_EOF_ #!/bin/sh # -# \$NetBSD: mklivecd.sh,v 1.26 2006/10/12 15:03:51 xtraeme Exp $ +# \$NetBSD: mklivecd.sh,v 1.27 2006/10/13 13:07:12 xtraeme Exp $ # # PROVIDE: root @@ -829,7 +829,7 @@ _EOF_ [ -n "$verbose_mode" ] && showmsg "Size: $(du -sh $ISODIR)" ;; clean) - if [ -f $pkgsrc_mntstat -o -f $pkgsrcdist_mntstat ]; then + if [ -f $pkgsrc_mntstat -o -f $pkgsrcdist_mntstat -o -f $packages_mntstat ]; then showmsg "The pkgsrc directories are still in use! Exiting." bye 1 fi @@ -884,7 +884,7 @@ _EOF_ # # Detect if we are running a MULTIBOOT kernel. # - if [ -f $ISODIR/boot/grub/menu.lst ]; then + if [ -f $ISODIR/$GRUB_BOOTDIR/menu.lst ]; then grep -q MULTIBOOT $WORKDIR/$BOOTKERN if [ "$?" -eq 0 ]; then showmsg "Applying fix for MULTIBOOT kernel..." |