[pkgsrc/trunk]: pkgsrc/sysutils/mklivecd/files Don't fail if $ISODIR/netbsd d...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a12be9e9680c
branches:  trunk
changeset: 474255:a12be9e9680c
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Tue Apr 27 01:18:08 2004 +0000

description:
Don't fail if $ISODIR/netbsd does not exists, because the kernel
could not be "netbsd". Add missing MKISOFS_ARGS to MISC_VARS.

diffstat:

 sysutils/mklivecd/files/mklivecd.sh |  16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diffs (46 lines):

diff -r 5b964a7a12e0 -r a12be9e9680c sysutils/mklivecd/files/mklivecd.sh
--- a/sysutils/mklivecd/files/mklivecd.sh       Tue Apr 27 01:15:59 2004 +0000
+++ b/sysutils/mklivecd/files/mklivecd.sh       Tue Apr 27 01:18:08 2004 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mklivecd.sh,v 1.7 2004/04/26 17:28:58 xtraeme Exp $
+# $NetBSD: mklivecd.sh,v 1.8 2004/04/27 01:18:08 xtraeme Exp $
 #
 # Copyright (c) 2004 Juan RP <xtraeme%NetBSD.org@localhost>
 # All rights reserved.
@@ -91,9 +91,9 @@
        BASE_VARS="SOURCEDIR PKGSRCDIR SHAREDIR BASEDIR WORKDIR ISODIR \
                   BASE_SETS_DIR X11_SETS_DIR BASE_SETS X11_SETS"
 
-       MISC_VARS="ENABLE_X11 CDRECORD_ARGS BLANK_BEFORE_BURN CDROM_DEVICE \
-                  PERSONAL_CONFIG BOOTKERN KERNEL_NAME IMAGE_NAME \
-                  PKG_SYSCONFDIR REMOVE_DIRS"
+       MISC_VARS="ENABLE_X11 MKISOFS_ARGS CDRECORD_ARGS BLANK_BEFORE_BURN \
+                  CDROM_DEVICE PERSONAL_CONFIG BOOTKERN KERNEL_NAME \
+                  IMAGE_NAME PKG_SYSCONFDIR REMOVE_DIRS"
 
        MNT_VARS="MNT_DEV_ARGS MNT_ETC_ARGS MNT_VAR_ARGS \
                  MNT_ROOT_ARGS MNT_TMP_ARGS MNT_HOME_ARGS \
@@ -341,7 +341,7 @@
                cat > $ISODIR/etc/rc.d/root <<_EOF_
 #!/bin/sh
 #
-# \$NetBSD: mklivecd.sh,v 1.7 2004/04/26 17:28:58 xtraeme Exp $
+# \$NetBSD: mklivecd.sh,v 1.8 2004/04/27 01:18:08 xtraeme Exp $
 # 
 
 # PROVIDE: root
@@ -530,11 +530,7 @@
                showmsg "Done."
        ;;
        iso)
-               if [ ! -f $ISODIR/netbsd ]; then
-                       showmsg "Target iso failed!"
-                       showmsg "Can't find NetBSD kernel."
-                       bye 1
-               elif [ ! -f $ISODIR/stand/mfs_etc.tbz ]; then
+               if [ ! -f $ISODIR/stand/mfs_etc.tbz ]; then
                        showmsg "Target iso failed!"
                        showmsg "Can't find mfs_etc.tbz file."
                        bye 1