Remove cd9660's chrp-boot option. deraadt confirmed we don't support any

CHRP hardware.

4 files changed, 5 insertions, 19 deletions

diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c
index 9b58966a417..d54edad8525 100644
--- a/usr.sbin/makefs/cd9660.c
+++ b/usr.sbin/makefs/cd9660.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660.c,v 1.15 2016/10/26 14:06:46 natano Exp $	*/
+/*	$OpenBSD: cd9660.c,v 1.16 2016/10/26 14:14:16 natano Exp $	*/
 /*	$NetBSD: cd9660.c,v 1.52 2015/12/24 15:52:37 christos Exp $	*/
 
 /*
@@ -200,8 +200,6 @@ cd9660_set_defaults(iso9660_disk *diskStructure)
 	diskStructure->rock_ridge_move_count = 0;
 	diskStructure->rr_moved_dir = 0;
 
-	diskStructure->chrp_boot = 0;
-
 	diskStructure->include_padding_areas = 1;
 
 	/* Spec breaking functionality */
@@ -258,7 +256,6 @@ cd9660_prep_opts(fsinfo_t *fsopts)
 		OPT_STR("applicationid"),
 		OPT_STR("boot-load-segment"),
 		OPT_STR("bootimage"),
-	        OPT_BOOL("chrp-boot", chrp_boot),
 		OPT_STR("generic-bootimage"),
 		OPT_STR("hard-disk-boot"),
 		OPT_NUM("isolevel", isoLevel, 1, 3),
diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h
index 0ae76877036..9466348700d 100644
--- a/usr.sbin/makefs/cd9660.h
+++ b/usr.sbin/makefs/cd9660.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660.h,v 1.9 2016/10/26 07:53:47 natano Exp $	*/
+/*	$OpenBSD: cd9660.h,v 1.10 2016/10/26 14:14:16 natano Exp $	*/
 /*	$NetBSD: cd9660.h,v 1.21 2015/12/24 15:52:37 christos Exp $	*/
 
 /*
@@ -270,8 +270,6 @@ typedef struct _iso9660_disk {
 	int rock_ridge_move_count;
 	cd9660node *rr_moved_dir;
 
-	int chrp_boot;
-
 	/* Spec breaking options */
 	int allow_deep_trees;
 	int allow_multidot;
diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c b/usr.sbin/makefs/cd9660/cd9660_eltorito.c
index d9015cd0f19..e4dc9e0a1be 100644
--- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c
+++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_eltorito.c,v 1.5 2016/10/23 11:09:38 natano Exp $	*/
+/*	$OpenBSD: cd9660_eltorito.c,v 1.6 2016/10/26 14:14:17 natano Exp $	*/
 /*	$NetBSD: cd9660_eltorito.c,v 1.20 2013/01/28 21:03:28 christos Exp $	*/
 
 /*
@@ -582,7 +582,7 @@ cd9660_write_boot(iso9660_disk *diskStructure, FILE *fd)
 	}
 
 	/* some systems need partition tables as well */
-	if (mbr_partitions > 0 || diskStructure->chrp_boot) {
+	if (mbr_partitions > 0) {
 		uint16_t sig;
 
 		fseek(fd, 0x1fe, SEEK_SET);
@@ -591,12 +591,6 @@ cd9660_write_boot(iso9660_disk *diskStructure, FILE *fd)
 
 		mbr_partitions = 0;
 
-		/* Write ISO9660 descriptor, enclosing the whole disk */
-		if (diskStructure->chrp_boot)
-			cd9660_write_mbr_partition_entry(fd, mbr_partitions++,
-			    0, diskStructure->totalSectors *
-			    (diskStructure->sectorSize / 512), 0x96);
-
 		/* Write all partition entries */
 		TAILQ_FOREACH(t, &diskStructure->boot_images, image_list) {
 			if (t->system != ET_SYS_PPC)
diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8
index 69153e22f39..da7cbf6ce73 100644
--- a/usr.sbin/makefs/makefs.8
+++ b/usr.sbin/makefs/makefs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: makefs.8,v 1.12 2016/10/26 07:53:47 natano Exp $
+.\"	$OpenBSD: makefs.8,v 1.13 2016/10/26 14:14:16 natano Exp $
 .\"	$NetBSD: makefs.8,v 1.55 2015/11/25 16:32:00 wiz Exp $
 .\"
 .\" Copyright (c) 2001-2003 Wasabi Systems, Inc.
@@ -207,9 +207,6 @@ is one of
 .Ql macppc ,
 or
 .Ql powerpc .
-.It Sy chrp-boot
-Write an MBR partition table to the image to allow older CHRP hardware to
-boot.
 .It Sy generic-bootimage
 Load a generic boot image into the first 32K of the CD9660 image.
 .It Sy hard-disk-boot