create uefi/bios dual bootable images

Author: tsoome

usr/src/cmd/distro_const/utils/create_iso

@@ -105,10 +105,33 @@ rm -f "$DIST_ISO"
 PLATFORM=$(uname -m)
 
 if [[ "${PLATFORM}" == "i86pc" ]] ; then
-	$MKISOFS -o "$DIST_ISO" -b boot/cdboot -c .catalog \
-	    -no-emul-boot -boot-load-size 4 -boot-info-table -N -l -R -U \
+	# create efi bootblock
+	/usr/bin/dd if=/dev/zero count=4400 bs=1024 \
+	    of="${PKG_IMG_PATH}/boot/efiboot.img" 2> /dev/null
+	LOFIDEV="`lofiadm -a ${PKG_IMG_PATH}/boot/efiboot.img`"
+	RLOFIDEV="/dev/rlofi/${LOFIDEV##/*/}"
+	/usr/sbin/mkfs -F pcfs -o nofdisk,size=8800 ${RLOFIDEV} < /dev/null
+	MDIR="`/bin/mktemp -d`"
+	/usr/sbin/mount -F pcfs ${LOFIDEV} ${MDIR}
+	mkdir -p ${MDIR}/efi/boot
+	if [ -f ${PKG_IMG_PATH}/boot/loader32.efi ] ; then
+	  cp ${PKG_IMG_PATH}/boot/loader32.efi ${MDIR}/efi/boot/bootia32.efi
+	  cp ${PKG_IMG_PATH}/boot/loader64.efi ${MDIR}/efi/boot/bootx64.efi
+	else
+	  cp ${PKG_IMG_PATH}/boot/loader.efi ${MDIR}/efi/boot/bootx64.efi
+	fi
+	/usr/sbin/umount ${MDIR}
+	rmdir ${MDIR}
+	lofiadm -d ${LOFIDEV}
+
+	# the option order is important!
+	$MKISOFS -o "$DIST_ISO" -c .catalog -N -l -R -U \
 	    -allow-multidot -no-iso-translate -cache-inodes -d -D -volset \
-	    "$VOLSETID" -V "$DISTRO_NAME" "$PKG_IMG_PATH"
+	    "$VOLSETID" -V "$DISTRO_NAME" \
+	    -eltorito-boot boot/cdboot -no-emul-boot -boot-info-table \
+	    -eltorito-alt-boot \
+	    -eltorito-boot boot/efiboot.img -no-emul-boot \
+	    "$PKG_IMG_PATH"
 else
 	# 
 	# First create the hsfs bootblock

usr/src/cmd/install-tools/usbgen

@@ -303,13 +303,15 @@ mount -F hsfs "${isodev}" "${iso_path}" || \
 # Compute the size for the new USB image.
 # Use ISO file size + 20% to account for smaller block size on UFS
 # and the log. Round to nearest kbyte plus 512
-# plus 4MB for MBR+SMI label
+# plus 4MB for label
+# plus 34MB for system partition
+# plus 1MB for boot partition
 #
 get_filesize "usb_size" "${iso_file}"
 if (( usb_size == -1 )) ; then
 	error_handler "Failed to get size of file ${iso_file}"
 fi
-(( usb_size=((int( (usb_size * 1.2) / 1024.) * 1024.) + 512) + 4194304 ))
+(( usb_size=((int( (usb_size * 1.2) / 1024.) * 1024.) + 512) + 41943040 )) 
 
 #
 # Create and mount an empty new USB image.
@@ -324,40 +326,64 @@ devs="$(lofiadm -la "${usb_file}")" || \
 # Set rdevs by replacing dsk with rdsk in devs
 #
 rdevs="${devs/dsk/rdsk}"
-# for mount
+# for system partition
 s0devs="${devs/p0/s0}"
-# for newfs and installboot
-rs0devs="${rdevs/p0/s0}"
-# for prtvtoc | fmthard
+s2devs="${devs/p0/s2}"
+# for newfs and installboot and prtvtoc | fmthard
 rs2devs="${rdevs/p0/s2}"
+rs0devs="${rdevs/p0/s0}"
+pdev="${devs/p0/}"
 
 #
-# create Solaris2 partition
+# create GPT partitioning with system, boot and root
 #
-fdisk -B "${rdevs}"
+zpool create -B -o bootsize=34M usbgen-$$ $pdev
+zpool destroy usbgen-$$
+
 prtvtoc "${rs2devs}" | nawk '
 /^[^\*]/ { r = $1; for(n = 1; n <= NF; n++) vtoc[r,n] = $n }
 END {
-vtoc[0,1] = 0;
-vtoc[0,2] = 2;
-vtoc[0,3] = 00;
-vtoc[0,4] = vtoc[8,6] + 1;
-vtoc[0,5] = vtoc[2,6] - vtoc[8,6];
-vtoc[0,6] = vtoc[2,6];
+vtoc[1,1] = 1;
+vtoc[1,2] = 1;
+vtoc[1,3] = 00;
+vtoc[1,5] = 1024 * 1024 / 512;
+vtoc[1,6] = vtoc[1,4] + vtoc[1,5] - 1;
+
+vtoc[2,1] = 2;
+vtoc[2,2] = 2;
+vtoc[2,3] = 00;
+vtoc[2,4] = vtoc[1,6] + 1;
+vtoc[2,6] = vtoc[8,4] - 1;
+vtoc[2,5] = vtoc[2,6] - vtoc[2,4];
+
+printf("\t%d\t%d\t%02d\t%d\t%d\t%d\n",
+        vtoc[0,1], vtoc[0,2], vtoc[0,3], vtoc[0,4], vtoc[0,5], vtoc[0,6]);
 printf("\t%d\t%d\t%02d\t%d\t%d\t%d\n",
-	vtoc[0,1], vtoc[0,2], vtoc[0,3], vtoc[0,4], vtoc[0,5], vtoc[0,6]);
+        vtoc[1,1], vtoc[1,2], vtoc[1,3], vtoc[1,4], vtoc[1,5], vtoc[1,6]);
 printf("\t%d\t%d\t%02d\t%d\t%d\t%d\n",
-	vtoc[2,1], vtoc[2,2], vtoc[2,3], vtoc[2,4], vtoc[2,5], vtoc[2,6]);
+        vtoc[2,1], vtoc[2,2], vtoc[2,3], vtoc[2,4], vtoc[2,5], vtoc[2,6]);
 printf("\t%d\t%d\t%02d\t%d\t%d\t%d\n",
-	vtoc[8,1], vtoc[8,2], vtoc[8,3], vtoc[8,4], vtoc[8,5], vtoc[8,6]);
+        vtoc[8,1], vtoc[8,2], vtoc[8,3], vtoc[8,4], vtoc[8,5], vtoc[8,6]);
 }' | fmthard -s- "${rs2devs}"
 
+mkfs -F pcfs -o b=system ${rs0devs} < /dev/null
+
+mount -F pcfs ${s0devs} ${usb_path}
+mkdir -p ${usb_path}/efi/boot
+if [ -f ${iso_path}/boot/bootia32.efi ] ; then
+  cp ${iso_path}/boot/bootia32.efi ${usb_path}/efi/boot/BOOTIA32.EFI
+  cp ${iso_path}/boot/bootx64.efi ${usb_path}/efi/boot/BOOTX64.EFI
+else
+  cp ${iso_path}/boot/boot1.efi ${usb_path}/efi/boot/BOOTX64.EFI
+fi
+umount ${usb_path}
+
 # newfs doesn't ask questions if stdin isn't a tty.
-newfs "${rs0devs}" </dev/null || \
-	error_handler "Failed to construct the UFS file system ${rs0devs}"
+newfs "${rs2devs}" </dev/null || \
+	error_handler "Failed to construct the UFS file system ${rs2devs}"
 
-mount -o nologging "${s0devs}" "${usb_path}" || \
-	error_handler "Failed to mount construct the UFS file system ${rs0devs}"
+mount -o nologging "${s2devs}" "${usb_path}" || \
+	error_handler "Failed to mount construct the UFS file system ${rs2devs}"
 
 #
 # Copy the contents of the ISO file to the new USB image.
@@ -369,7 +395,7 @@ print "Copying ISO contents to USB image..."
 # install bootblocks
 #
 installboot -mf "${usb_path}/boot/pmbr" "${usb_path}/boot/gptzfsboot" \
-	"${rs0devs}"
+	"${rs2devs}"
 
 # If we get an error hereforth in menu.lst modifications, proceed with a warning
 trap "" ERR INT