 @@ -1,14 +1,14 @@
-/*	$NetBSD: cd9660.c,v 1.53 2016/11/25 23:02:44 christos Exp $	*/
+/*	$NetBSD: cd9660.c,v 1.54 2017/01/24 11:22:43 nonaka Exp $	*/
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
  * Perez-Rathke and Ram Vedam.  All rights reserved.
+ *
  * This code was written by Daniel Watt, Walter Deignan, Ryan Gabrys,
  * Alan Perez-Rathke and Ram Vedam.
+ *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
  * conditions are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -93,27 +93,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
   */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #else
 #include <sys/mount.h>
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660.c,v 1.53 2016/11/25 23:02:44 christos Exp $");
+__RCSID("$NetBSD: cd9660.c,v 1.54 2017/01/24 11:22:43 nonaka Exp $");
 #endif  /* !__lint */
 #include <string.h>
 #include <ctype.h>
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <util.h>
 #include "makefs.h"
 #include "cd9660.h"
 #include "cd9660/iso9660_rrip.h"
 #include "cd9660/cd9660_archimedes.h"
 @@ -311,26 +311,27 @@ cd9660_prep_opts(fsinfo_t *fsopts)
 		OPT_STR('A', "applicationid", "Application Identifier"),
 		OPT_STR('P', "publisher", "Publisher Identifier"),
 		OPT_STR('p', "preparer", "Preparer Identifier"),
 		OPT_STR('L', "label", "Disk Label"),
 		OPT_STR('V', "volumeid", "Volume Set Identifier"),
 		OPT_STR('B', "bootimage", "Boot image parameter"),
 		OPT_STR('G', "generic-bootimage", "Generic boot image param"),
 		OPT_STR('\0', "bootimagedir", "Boot image directory"),
 		OPT_STR('\0', "no-emul-boot", "No boot emulation"),
 		OPT_STR('\0', "no-boot", "No boot support"),
 		OPT_STR('\0', "hard-disk-boot", "Boot from hard disk"),
 		OPT_STR('\0', "boot-load-segment", "Boot load segment"),
 		OPT_STR('\0', "platformid", "Section Header Platform ID"),
 		{ .name = NULL }
 	};
 	fsopts->fs_specific = diskStructure;
 	fsopts->fs_options = copy_opts(cd9660_options);
 	cd9660_set_defaults(diskStructure);
+}
 void
 cd9660_cleanup_opts(fsinfo_t *fsopts)
+{
 @@ -448,27 +449,28 @@ cd9660_parse_opts(const char *option, fs
 			} else {
 				diskStructure->boot_image_directory =
 				     emalloc(strlen(buf) + 1);
 				/* BIG TODO: Add the max length function here */
 				rv = cd9660_arguments_set_string(buf, desc, 12,
 				    'd', diskStructure->boot_image_directory);
+			}
 		} else if (strcmp(name, "no-emul-boot") == 0 ||
 		    strcmp(name, "no-boot") == 0 ||
 		    strcmp(name, "hard-disk-boot") == 0) {
 			/* RRIP */
 			cd9660_eltorito_add_boot_option(diskStructure, name, 0);
 			rv = 1;
-		} else if (strcmp(name, "boot-load-segment") == 0) {
+		} else if (strcmp(name, "boot-load-segment") == 0 ||
 		    strcmp(name, "platformid") == 0) {
 			if (buf[0] == '\0') {
 				warnx("Option `%s' doesn't contain a value",
 				    name);
 				rv = 0;
 			} else {
 				cd9660_eltorito_add_boot_option(diskStructure,
 				    name, buf);
 				rv = 1;
+			}
 		} else
 			rv = 1;
+	}
 	return rv;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cd9660_eltorito.c,v 1.20 2013/01/28 21:03:28 christos Exp $	*/
+/*	$NetBSD: cd9660_eltorito.c,v 1.21 2017/01/24 11:22:43 nonaka Exp $	*/
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
  * Perez-Rathke and Ram Vedam.  All rights reserved.
+ *
  * This code was written by Daniel Watt, Walter Deignan, Ryan Gabrys,
  * Alan Perez-Rathke and Ram Vedam.
+ *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
  * conditions are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -30,47 +30,48 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  */
 #include "cd9660.h"
 #include "cd9660_eltorito.h"
 #include <sys/bootblock.h>
 #include <util.h>
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660_eltorito.c,v 1.20 2013/01/28 21:03:28 christos Exp $");
+__RCSID("$NetBSD: cd9660_eltorito.c,v 1.21 2017/01/24 11:22:43 nonaka Exp $");
 #endif  /* !__lint */
 #ifdef DEBUG
 #define	ELTORITO_DPRINTF(__x)	printf __x
 #else
 #define	ELTORITO_DPRINTF(__x)
 #endif
 #include <util.h>
 static struct boot_catalog_entry *cd9660_init_boot_catalog_entry(void);
 static struct boot_catalog_entry *cd9660_boot_setup_validation_entry(char);
 static struct boot_catalog_entry *cd9660_boot_setup_default_entry(
     struct cd9660_boot_image *);
 static struct boot_catalog_entry *cd9660_boot_setup_section_head(char);
 static struct boot_catalog_entry *cd9660_boot_setup_validation_entry(char);
 #if 0
 static u_char cd9660_boot_get_system_type(struct cd9660_boot_image *);
 #endif
 static struct cd9660_boot_image *default_boot_image;
 int
 cd9660_add_boot_disk(iso9660_disk *diskStructure, const char *boot_info)
+{
 	struct stat stbuf;
 	const char *mode_msg;
 	char *temp;
 	char *sysname;
 	char *filename;
 	struct cd9660_boot_image *new_image, *tmp_image;
 	assert(boot_info != NULL);
 	if (*boot_info == '\0') {
 @@ -165,29 +166,35 @@ cd9660_add_boot_disk(iso9660_disk *diskS
 	TAILQ_FOREACH(tmp_image, &diskStructure->boot_images, image_list) {
 		if (tmp_image->system != new_image->system)
 			break;
+	}
 	if (tmp_image == NULL) {
 		TAILQ_INSERT_HEAD(&diskStructure->boot_images, new_image,
 		    image_list);
 	} else
 		TAILQ_INSERT_BEFORE(tmp_image, new_image, image_list);
 	new_image->serialno = diskStructure->image_serialno++;
 	new_image->platform_id = new_image->system;
 	/* TODO : Need to do anything about the boot image in the tree? */
 	diskStructure->is_bootable = 1;
 	/* First boot image is initial/default entry. */
 	if (default_boot_image == NULL)
 		default_boot_image = new_image;
 	return 1;
+}
 int
 cd9660_eltorito_add_boot_option(iso9660_disk *diskStructure,
     const char *option_string, const char *value)
+{
 	char *eptr;
 	struct cd9660_boot_image *image;
 	assert(option_string != NULL);
 	/* Find the last image added */
 @@ -201,26 +208,33 @@ cd9660_eltorito_add_boot_option(iso9660_
 	if (strcmp(option_string, "no-emul-boot") == 0) {
 		image->targetMode = ET_MEDIA_NOEM;
 	} else if (strcmp(option_string, "no-boot") == 0) {
 		image->bootable = ET_NOT_BOOTABLE;
 	} else if (strcmp(option_string, "hard-disk-boot") == 0) {
 		image->targetMode = ET_MEDIA_HDD;
 	} else if (strcmp(option_string, "boot-load-segment") == 0) {
 		image->loadSegment = strtoul(value, &eptr, 16);
 		if (eptr == value || *eptr != '\0' || errno != ERANGE) {
 			warn("%s: strtoul", __func__);
 			return 0;
+		}
 	} else if (strcmp(option_string, "platformid") == 0) {
 		if (strcmp(value, "efi") == 0)
 			image->platform_id = ET_SYS_EFI;
 		else {
 			warn("%s: unknown platform: %s", __func__, value);
 			return 0;
+		}
 	} else {
 		return 0;
+	}
 	return 1;
+}
 static struct boot_catalog_entry *
 cd9660_init_boot_catalog_entry(void)
+{
 	return ecalloc(1, sizeof(struct boot_catalog_entry));
+}
 static struct boot_catalog_entry *
 @@ -332,32 +346,32 @@ cd9660_boot_get_system_type(struct cd966
+}
 #endif
 /*
  * Set up the BVD, Boot catalog, and the boot entries, but do no writing
  */
 int
 cd9660_setup_boot(iso9660_disk *diskStructure, int first_sector)
+{
 	int sector;
 	int used_sectors;
 	int num_entries = 0;
 	int catalog_sectors;
-	struct boot_catalog_entry *x86_head, *mac_head, *ppc_head,
+	struct boot_catalog_entry *x86_head, *mac_head, *ppc_head, *efi_head,
 		*valid_entry, *default_entry, *temp, *head, **headp, *next;
 	struct cd9660_boot_image *tmp_disk;
 	headp = NULL;
-	x86_head = mac_head = ppc_head = NULL;
+	x86_head = mac_head = ppc_head = efi_head = NULL;
 	/* If there are no boot disks, don't bother building boot information */
 	if (TAILQ_EMPTY(&diskStructure->boot_images))
 		return 0;
 	/* Point to catalog: For now assume it consumes one sector */
 	ELTORITO_DPRINTF(("Boot catalog will go in sector %d\n", first_sector));
 	diskStructure->boot_catalog_sector = first_sector;
 	cd9660_bothendian_dword(first_sector,
 		diskStructure->boot_descriptor->boot_catalog_pointer);
 	/* Step 1: Generate boot catalog */
 	/* Step 1a: Validation entry */
 @@ -381,97 +395,117 @@ cd9660_setup_boot(iso9660_disk *diskStru
 	catalog_sectors = howmany(num_entries * 0x20, diskStructure->sectorSize);
 	used_sectors += catalog_sectors;
 	if (diskStructure->verbose_level > 0) {
 		printf("%s: there will be %i entries consuming %i sectors. "
 		       "Catalog is %i sectors\n", __func__, num_entries,
 		       used_sectors, catalog_sectors);
+	}
 	/* Populate sector numbers */
 	sector = first_sector + catalog_sectors;
 	TAILQ_FOREACH(tmp_disk, &diskStructure->boot_images, image_list) {
 		tmp_disk->sector = sector;
-		sector += tmp_disk->num_sectors;
+		sector += tmp_disk->num_sectors /
 		    (diskStructure->sectorSize / 512);
+	}
 	LIST_INSERT_HEAD(&diskStructure->boot_entries, valid_entry, ll_struct);
 	/* Step 1b: Initial/default entry */
 	/* TODO : PARAM */
-	tmp_disk = TAILQ_FIRST(&diskStructure->boot_images);
+	if (default_boot_image != NULL) {
 		struct cd9660_boot_image *tcbi;
 		TAILQ_FOREACH(tcbi, &diskStructure->boot_images, image_list) {
 			if (tcbi == default_boot_image) {
 				tmp_disk = tcbi;
 				break;
+			}
+		}
+	}
 	if (tmp_disk == NULL)
 		tmp_disk = TAILQ_FIRST(&diskStructure->boot_images);
 	default_entry = cd9660_boot_setup_default_entry(tmp_disk);
 	if (default_entry == NULL) {
 		warnx("Error: memory allocation failed in cd9660_setup_boot");
 		return -1;
+	}
 	LIST_INSERT_AFTER(valid_entry, default_entry, ll_struct);
 	/* Todo: multiple default entries? */
-	tmp_disk = TAILQ_NEXT(tmp_disk, image_list);
+	tmp_disk = TAILQ_FIRST(&diskStructure->boot_images);
 	head = NULL;
 	temp = default_entry;
 	/* If multiple boot images are given : */
-	while (tmp_disk != NULL) {
+	for (; tmp_disk != NULL; tmp_disk = TAILQ_NEXT(tmp_disk, image_list)) {
 		if (tmp_disk == default_boot_image)
 			continue;
 		/* Step 2: Section header */
-		switch (tmp_disk->system) {
+		switch (tmp_disk->platform_id) {
 		case ET_SYS_X86:
 			headp = &x86_head;
 			break;
 		case ET_SYS_PPC:
 			headp = &ppc_head;
 			break;
 		case ET_SYS_MAC:
 			headp = &mac_head;
 			break;
 		case ET_SYS_EFI:
 			headp = &efi_head;
 			break;
 		default:
 			warnx("%s: internal error: unknown system type",
 			    __func__);
 			return -1;
+		}
 		if (*headp == NULL) {
 			head =
-			    cd9660_boot_setup_section_head(tmp_disk->system);
+			  cd9660_boot_setup_section_head(tmp_disk->platform_id);
 			if (head == NULL) {
 				warnx("Error: memory allocation failed in "
 				      "cd9660_setup_boot");
 				return -1;
+			}
 			LIST_INSERT_AFTER(default_entry, head, ll_struct);
 			*headp = head;
 		} else
 			head = *headp;
 		head->entry_data.SH.num_section_entries[0]++;
 		/* Step 2a: Section entry and extensions */
 		temp = cd9660_boot_setup_section_entry(tmp_disk);
 		if (temp == NULL) {
 			warn("%s: cd9660_boot_setup_section_entry", __func__);
 			return -1;
+		}
 		while ((next = LIST_NEXT(head, ll_struct)) != NULL &&
 		       next->entry_type == ET_ENTRY_SE)
 			head = next;
 		LIST_INSERT_AFTER(head, temp, ll_struct);
 		tmp_disk = TAILQ_NEXT(tmp_disk, image_list);
+	}
 	if (head != NULL)
 		head->entry_data.SH.header_indicator[0] = ET_SECTION_HEADER_LAST;
 	/* TODO: Remaining boot disks when implemented */
 	return first_sector + used_sectors;
+}
 int
 cd9660_setup_boot_volume_descriptor(iso9660_disk *diskStructure,
     volume_descriptor *bvd)
+{
 	boot_volume_descriptor *bvdData =
 	    (boot_volume_descriptor*)bvd->volumeDescriptorData;
 	bvdData->boot_record_indicator[0] = ISO_VOLUME_DESCRIPTOR_BOOT;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cd9660_eltorito.h,v 1.5 2009/07/04 14:31:38 ahoka Exp $	*/
+/*	$NetBSD: cd9660_eltorito.h,v 1.6 2017/01/24 11:22:43 nonaka Exp $	*/
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
  * Perez-Rathke and Ram Vedam.  All rights reserved.
+ *
  * This code was written by Daniel Watt, Walter Deignan, Ryan Gabrys,
  * Alan Perez-Rathke and Ram Vedam.
+ *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
  * conditions are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -30,26 +30,27 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
  * OF SUCH DAMAGE.
  */
 #ifndef _CD9660_ELTORITO_H_
 #define _CD9660_ELTORITO_H_
 /* Boot defines */
 #define	ET_ID		"EL TORITO SPECIFICATION"
 #define	ET_SYS_X86	0
 #define	ET_SYS_PPC	1
 #define	ET_SYS_MAC	2
 #define	ET_SYS_EFI	0xef	/* Platform ID at section header entry */
 #define ET_BOOT_ENTRY_SIZE 0x20
 #define	ET_BOOTABLE		0x88
 #define	ET_NOT_BOOTABLE	0
 #define	ET_MEDIA_NOEM	0
 #define	ET_MEDIA_12FDD			1
 #define	ET_MEDIA_144FDD			2
 #define	ET_MEDIA_288FDD			3
 #define	ET_MEDIA_HDD			4
 #define ET_INDICATOR_HEADERMORE	0x90
 @@ -135,26 +136,27 @@ struct boot_catalog_entry {
 	LIST_ENTRY(boot_catalog_entry) ll_struct;
 };
 /* Temporary structure */
 struct cd9660_boot_image {
 	char *filename;
 	int size;
 	int sector; 			/* copied to LoadRBA */
 	int num_sectors;
 	unsigned int loadSegment;
 	u_char targetMode;
 	u_char system;
 	u_char bootable;
 	u_char platform_id;		/* for section header entry */
 	/*
 	 * If the boot image exists in the filesystem
 	 * already, this is a pointer to that node. For the sake
 	 * of simplicity in future versions, this pointer is only
 	 * to the node in the primary volume. This SHOULD be done
 	 * via a hashtable lookup.
 	 */
 	struct _cd9660node *boot_image_node;
 	TAILQ_ENTRY(cd9660_boot_image) image_list;
 	int serialno;
 };

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: makefs.8,v 1.57 2017/01/11 13:47:27 wiz Exp $
+.\"	$NetBSD: makefs.8,v 1.58 2017/01/24 11:22:43 nonaka Exp $
 .\"
 .\" Copyright (c) 2001-2003 Wasabi Systems, Inc.
 .\" All rights reserved.
 .\"
 .\" Written by Luke Mewburn for Wasabi Systems, Inc.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 @@ -356,26 +356,28 @@ Don't throw away images whose write was
 For debugging purposes.
 .It Sy label
 Label name of the image.
 .It Sy no-boot
 Boot image is not bootable.
 .It Sy no-emul-boot
 Boot image is a
 .Dq no emulation
 ElTorito image.
 .It Sy no-trailing-padding
 Do not pad the image (apparently Linux needs the padding).
 .\" .It Sy omit-trailing-period
 .\" Unknown
 .It Sy platformid
 Set platform ID of section header entry of the boot image.
 .It Sy preparer
 Preparer ID of the image.
 .It Sy publisher
 Publisher ID of the image.
 .It Sy rockridge
 Use RockRidge extensions (for longer filenames, etc.).
 .It Sy volumeid
 Volume set identifier of the image.
 .El
 .Ss CHFS-specific options
 .Sy chfs
 images have chfs-specific optional parameters that may be provided.
 Each of the options consists of a keyword, an equal sign