diff --git a/releng/releng_build_isojigdo b/releng/releng_build_isojigdo index 5a2a540d..913bfe90 100755 --- a/releng/releng_build_isojigdo +++ b/releng/releng_build_isojigdo @@ -27,7 +27,7 @@ Usage: ISOLINUX_BIN=/path/to/isolinux.bin BOOT_CAT=/path/to/boot.cat # without using a config file - $0 xorriso_cmd IN_dir OUT_image [IN_isolinux] [IN_bootcat] [-clean] + $0 xorriso_cmd IN_dir OUT_image [IN_isolinux] [OUT_bootcat] [-clean] HLP } @@ -70,7 +70,7 @@ fi # all must be set at this point printf "$0: Config items:" printf "\n\txorriso_cmd=${XOR}\n\tIN_dir=${DIR}\n\tOUT_image=${IMG}.iso" -printf "\n\tIN_isolinux=${ISOLINUX_BIN}\n\tIN_bootcat=${BOOT_CAT}\n" +printf "\n\tIN_isolinux=${ISOLINUX_BIN}\n\tOUT_bootcat=${BOOT_CAT}\n" RES="${IMG}.iso ${IMG}.new ${IMG}.md5 ${IMG}.jigdo ${IMG}.template" ############################################################ main() { @@ -106,15 +106,16 @@ CMD="${XOR} \ -partition_offset 16 \ -J -joliet-long \ " + # boot section TODO -#if [ "${5}" -a "${6}" ]; then +#if [ "${ISOLINUX_BIN}" -a "${BOOT_CAT}" ]; then #CMD+=\ -# -b boot/isolinux/isolinux.bin \ # $5 -# -c boot/boot.cat \ # $6 +# -b ${ISOLINUX_BIN} \ # NOTE: boot/isolinux/isolinux.bin +# -c ${BOOT_CAT} \ # NOTE: boot/boot.cat # -no-emul-boot -boot-load-size 4 -boot-info-table \ # -isohybrid-mbr somembr.sysarea \ # TODO: figure out where to grab one # -partition_offset 16 \ -# -append_partition 2 0x01 fatpart.fat \ +# -append_partition 2 0x01 fatpart.fat \ # TODO: create one unconditionally? #fi # jigdo section @@ -149,8 +150,6 @@ else exit 1 fi - - # trap the exit code of diff and let the Universe explode diff ${IMG}.iso ${IMG}.new DIFF_RET="$?"