summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorxtraeme <xtraeme>2005-03-16 05:31:23 +0000
committerxtraeme <xtraeme>2005-03-16 05:31:23 +0000
commit666322e92ccf7367b1e70c152e2027dfaebee6f6 (patch)
tree252118a1fcdf30f2323f821d305c93da076310d6 /sysutils
parent375e6221e690a01e5aba8abcab680119f44cb434 (diff)
downloadpkgsrc-666322e92ccf7367b1e70c152e2027dfaebee6f6.tar.gz
Update to 0.10:
* Copy all stage 1.5 files from GRUB into $ISODIR/grub/, useful to boot from any existing partition in the disk. * Show usage when the target is not valid.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/mklivecd/Makefile4
-rwxr-xr-xsysutils/mklivecd/files/mklivecd.sh9
2 files changed, 8 insertions, 5 deletions
diff --git a/sysutils/mklivecd/Makefile b/sysutils/mklivecd/Makefile
index f930a1e26d8..7a8ab406923 100644
--- a/sysutils/mklivecd/Makefile
+++ b/sysutils/mklivecd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2005/01/11 02:08:53 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2005/03/16 05:31:23 xtraeme Exp $
-DISTNAME= mklivecd-0.9
+DISTNAME= mklivecd-0.10
CATEGORIES= sysutils
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/sysutils/mklivecd/files/mklivecd.sh b/sysutils/mklivecd/files/mklivecd.sh
index 8478404d02d..aa2e51eeab4 100755
--- a/sysutils/mklivecd/files/mklivecd.sh
+++ b/sysutils/mklivecd/files/mklivecd.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mklivecd.sh,v 1.17 2005/01/11 02:08:53 xtraeme Exp $
+# $NetBSD: mklivecd.sh,v 1.18 2005/03/16 05:31:23 xtraeme Exp $
#
# Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -54,7 +54,7 @@
: ${MKISOFS_FIXED_ARGS:=-no-emul-boot -boot-load-size 30 -boot-info-table}
: ${BOOTDIR:=boot/grub}
: ${BOOTIMAGE:=stage2_eltorito}
-: ${GRUB_FILES:=stage2_eltorito iso9660_stage1_5}
+: ${GRUB_FILES:=stage2_eltorito iso9660_stage1_5 xfs_stage1_5 ufs2_stage1_5 reiserfs_stage1_5 jfs_stage1_5 ffs_stage1_5 fat_stage1_5 e2fs_stage1_5}
trap "echo; showmsg \"Process cancelled!\"; bye 127" INT QUIT
@@ -374,7 +374,7 @@ _EOF_
cat > $ISODIR/etc/rc.d/root <<_EOF_
#!/bin/sh
#
-# \$NetBSD: mklivecd.sh,v 1.17 2005/01/11 02:08:53 xtraeme Exp $
+# \$NetBSD: mklivecd.sh,v 1.18 2005/03/16 05:31:23 xtraeme Exp $
#
# PROVIDE: root
@@ -748,6 +748,9 @@ case "$target" in
checkconf
do_cdlive burn
;;
+ *)
+ usage
+ ;;
esac
exit 0 # agur!