Remove cd9660's keep-bad-images option.

4 files changed, 6 insertions, 13 deletions

diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c
index 3ad4e5cfb1a..4e99c0acc19 100644
--- a/usr.sbin/makefs/cd9660.c
+++ b/usr.sbin/makefs/cd9660.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660.c,v 1.11 2016/10/23 10:22:21 natano Exp $	*/
+/*	$OpenBSD: cd9660.c,v 1.12 2016/10/23 10:32:42 natano Exp $	*/
 /*	$NetBSD: cd9660.c,v 1.52 2015/12/24 15:52:37 christos Exp $	*/
 
 /*
@@ -194,7 +194,6 @@ cd9660_set_defaults(iso9660_disk *diskStructure)
 
 	/* Set up defaults in our own structure */
 	diskStructure->verbose_level = 0;
-	diskStructure->keep_bad_images = 0;
 	diskStructure->isoLevel = 2;
 
 	diskStructure->rock_ridge_enabled = 0;
@@ -277,7 +276,6 @@ cd9660_prep_opts(fsinfo_t *fsopts)
 		OPT_STR("generic-bootimage", "Generic boot image param"),
 		OPT_STR("hard-disk-boot", "Boot from hard disk"),
 		OPT_NUM("isolevel", isoLevel, 1, 3, "ISO Level"),
-	        OPT_BOOL("keep-bad-images", keep_bad_images, "Keep bad images"),
 		OPT_STR("label", "Disk Label"),
 		OPT_STR("no-boot", "No boot support"),
 		OPT_STR("no-emul-boot", "No boot emulation"),
diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h
index 0b2f5eff0e0..f079a0e40a7 100644
--- a/usr.sbin/makefs/cd9660.h
+++ b/usr.sbin/makefs/cd9660.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660.h,v 1.6 2016/10/22 20:50:21 natano Exp $	*/
+/*	$OpenBSD: cd9660.h,v 1.7 2016/10/23 10:32:42 natano Exp $	*/
 /*	$NetBSD: cd9660.h,v 1.21 2015/12/24 15:52:37 christos Exp $	*/
 
 /*
@@ -260,7 +260,6 @@ typedef struct _iso9660_disk {
 	int include_padding_areas;
 
 	int verbose_level;
-	int keep_bad_images;
 
 	/* SUSP options and variables */
 	int64_t susp_continuation_area_start_sector;
diff --git a/usr.sbin/makefs/cd9660/cd9660_write.c b/usr.sbin/makefs/cd9660/cd9660_write.c
index 5e44a72472c..7e5c6bd64d5 100644
--- a/usr.sbin/makefs/cd9660/cd9660_write.c
+++ b/usr.sbin/makefs/cd9660/cd9660_write.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_write.c,v 1.3 2016/10/16 20:26:56 natano Exp $	*/
+/*	$OpenBSD: cd9660_write.c,v 1.4 2016/10/23 10:32:42 natano Exp $	*/
 /*	$NetBSD: cd9660_write.c,v 1.17 2013/10/19 17:16:37 christos Exp $	*/
 
 /*
@@ -128,8 +128,7 @@ cd9660_write_image(iso9660_disk *diskStructure, const char* image)
 
 cleanup_bad_image:
 	fclose(fd);
-	if (!diskStructure->keep_bad_images)
-		unlink(image);
+	unlink(image);
 	if (diskStructure->verbose_level > 0)
 		printf("Bad image cleaned up\n");
 	return 0;
diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8
index 0920421da89..8efd70b0ee0 100644
--- a/usr.sbin/makefs/makefs.8
+++ b/usr.sbin/makefs/makefs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: makefs.8,v 1.9 2016/10/22 20:27:59 jmc Exp $
+.\"	$OpenBSD: makefs.8,v 1.10 2016/10/23 10:32:42 natano Exp $
 .\"	$NetBSD: makefs.8,v 1.55 2015/11/25 16:32:00 wiz Exp $
 .\"
 .\" Copyright (c) 2001-2003 Wasabi Systems, Inc.
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 22 2016 $
+.Dd $Mdocdate: October 23 2016 $
 .Dt MAKEFS 8
 .Os
 .Sh NAME
@@ -221,9 +221,6 @@ boot.
 Load a generic boot image into the first 32K of the CD9660 image.
 .It Sy hard-disk-boot
 Boot image is a hard disk image.
-.It Sy keep-bad-images
-Don't throw away images whose write was aborted due to an error.
-For debugging purposes.
 .It Sy label
 Label name of the image.
 .It Sy no-boot