--- util/geniso.orig	2015-06-05 20:26:05 UTC
+++ util/geniso
@@ -2,7 +2,7 @@
 #
 # Generate a isolinux ISO boot image
 
-function help() {
+help() {
 	echo "usage: ${0} [OPTIONS] foo.lkrn [bar.lkrn,...]"
 	echo
 	echo "where OPTIONS are:"
@@ -40,7 +40,7 @@ fi
 # There should either be mkisofs or the compatible genisoimage program
 for command in genisoimage mkisofs; do
 	if ${command} --version >/dev/null 2>/dev/null; then
-		mkisofs=(${command})
+		mkisofs=${command}
 		break
 	fi
 done
@@ -53,9 +53,9 @@ fi
 dir=$(mktemp -d bin/iso.dir.XXXXXX)
 cfg=${dir}/isolinux.cfg
 
-mkisofs+=(-quiet -l -volid "iPXE" -preparer "iPXE build system"
-	-appid "iPXE ${VERSION} - Open Source Network Boot Firmware"
-	-publisher "http://ipxe.org/" -c boot.cat)
+mkisofs="$mkisofs -quiet -l -volid \"iPXE\" -preparer \"iPXE build system\""
+mkisofs="$mkisofs -appid \"iPXE ${VERSION} - Open Source Network Boot Firmware\""
+mkisofs="$mkisofs -publisher \"http://ipxe.org/\" -c boot.cat"
 
 # generate the config
 cat > ${cfg} <<EOF
@@ -70,8 +70,7 @@ for f; do
 	fi
 	b=$(basename ${f})
 	g=${b%.lkrn}
-	g=${g//[^a-z0-9]}
-	g=${g:0:8}.krn
+	g=$(echo $g | sed -e 's/[^a-z0-9]//g' | cut -c1-8).krn
 	case "${FIRST}" in
 		"")
 			echo "DEFAULT ${b}"
@@ -116,20 +115,21 @@ case "${LEGACY}" in
 		fi
 
 		# generate the iso image
-		"${mkisofs[@]}" -b boot.img -output ${OUT} ${dir}
+		eval $mkisofs -b boot.img -output ${OUT} ${dir}
 		;;
 	0)
 		# copy isolinux bootloader
 		cp ${ISOLINUX_BIN} ${dir}
+		chmod +w $dir/isolinux.bin
 
 		# syslinux 6.x needs a file called ldlinux.c32
-		LDLINUX_C32=$(dirname ${ISOLINUX_BIN})/ldlinux.c32
+		LDLINUX_C32=/usr/local/share/syslinux/bios/com32/elflink/ldlinux/ldlinux.c32
 		if [ -s ${LDLINUX_C32} ]; then
 			cp ${LDLINUX_C32} ${dir}
 		fi
 
 		# generate the iso image
-		"${mkisofs[@]}" -b isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -output ${OUT} ${dir}
+		eval $mkisofs -b isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table -output ${OUT} ${dir}
 
 		# isohybrid will be used if available
 		if isohybrid --version >/dev/null 2>/dev/null; then