summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorxtraeme <xtraeme>2005-03-16 16:37:37 +0000
committerxtraeme <xtraeme>2005-03-16 16:37:37 +0000
commit807bfa0185fb7da9005232714814b2029f8eb9c6 (patch)
tree834bc5edcd75d7533c7f17c0a0b7c30ddfb61b78 /sysutils
parentcb64076921bcaab370156e5f45525d0b64f06607 (diff)
downloadpkgsrc-807bfa0185fb7da9005232714814b2029f8eb9c6.tar.gz
Copy the stage{1,2} GRUB files into $ISODIR/grub as well
(required to boot from any existing partition on the disk, missed in previous). Bump PKGREVISION.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/mklivecd/Makefile3
-rwxr-xr-xsysutils/mklivecd/files/mklivecd.sh6
2 files changed, 5 insertions, 4 deletions
diff --git a/sysutils/mklivecd/Makefile b/sysutils/mklivecd/Makefile
index 7a8ab406923..36f6375d128 100644
--- a/sysutils/mklivecd/Makefile
+++ b/sysutils/mklivecd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2005/03/16 05:31:23 xtraeme Exp $
+# $NetBSD: Makefile,v 1.16 2005/03/16 16:37:37 xtraeme Exp $
DISTNAME= mklivecd-0.10
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/sysutils/mklivecd/files/mklivecd.sh b/sysutils/mklivecd/files/mklivecd.sh
index aa2e51eeab4..c9ab2e7f477 100755
--- a/sysutils/mklivecd/files/mklivecd.sh
+++ b/sysutils/mklivecd/files/mklivecd.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mklivecd.sh,v 1.18 2005/03/16 05:31:23 xtraeme Exp $
+# $NetBSD: mklivecd.sh,v 1.19 2005/03/16 16:37:38 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 xfs_stage1_5 ufs2_stage1_5 reiserfs_stage1_5 jfs_stage1_5 ffs_stage1_5 fat_stage1_5 e2fs_stage1_5}
+: ${GRUB_FILES:=stage1 stage2 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.18 2005/03/16 05:31:23 xtraeme Exp $
+# \$NetBSD: mklivecd.sh,v 1.19 2005/03/16 16:37:38 xtraeme Exp $
#
# PROVIDE: root