diff --git a/releng/releng_isocontent b/releng/releng_isocontent index c28fa901..b41acbba 100755 --- a/releng/releng_isocontent +++ b/releng/releng_isocontent @@ -189,25 +189,24 @@ is_valid_iso9660() { printf "${prog}: FAIL: Not found: ${ISOfile}\n" fi if file ${ISOfile} | grep -P "ISO\s+9660\s+CD-ROM\s+filesystem\s+data" >/dev/null 2>&1; then - printf "=== ${ISOfile} OK\n" + printf "=== Resulting ${ISOfile} OK. Looks like ISO 9660 filesystem.\n" else failure=1 - printf "${prog}: FAIL: ${ISOfile} does not look like ISO 9660 filesystem data\n" + printf "${prog}: FAIL: ${ISOfile} DOES NOT look like ISO 9660 filesystem data.\n" fi } -echo "=== Producing simple images via -o" >&2 +echo -e "\n=== Producing simple image via -o" >&2 "$xorriso" -as mkisofs "$on_disk" -o "$workdir"/image_minus_o.iso is_valid_iso9660 "$workdir"/image_minus_o.iso -echo "=== Producing simple images via redirect" >&2 +echo -e "\n=== Producing simple image via redirect" >&2 "$xorriso" -as mkisofs "$on_disk" > "$workdir"/image_redirected.iso is_valid_iso9660 "$workdir"/image_redirected.iso -echo "=== Producing simple images via pipe" >&2 +echo -e "\n=== Producing simple image via pipe" >&2 "$xorriso" -as mkisofs "$on_disk" | cat > "$workdir"/image_piped.iso is_valid_iso9660 "$workdir"/image_piped.iso - -echo "=== Producing simple image" >&2 +echo -e "\n=== Producing simple image - for_backup/update_r/hardlinks" >&2 "$xorriso" \ $report_about \ -version \ @@ -216,6 +215,7 @@ echo "=== Producing simple image" >&2 -outdev "$image_file" \ -update_r "$on_disk" "$in_iso" \ -hardlinks perform_update +is_valid_iso9660 "$image_file" echo "=== Copying from image to temporary disk tree" >&2 "$xorriso" \ diff --git a/releng/run_all_releng b/releng/run_all_releng index d0b84094..a4e1b375 100755 --- a/releng/run_all_releng +++ b/releng/run_all_releng @@ -59,9 +59,10 @@ fi if [ -x ${s} -a ! -d ${s} ]; then # tee(1) does trailing \n, which is unwanted in that case printf "\n${SELF}: Running ./${s} ${PASSED_OPTIONS}..." - echo -e "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" >> ${CLOG} - echo -e "\n${SELF}: Running ./${s} ${PASSED_OPTIONS}..." >> ${CLOG} - echo -e "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" >> ${CLOG} + echo -e "\n" >> ${CLOG} + echo -e "_________________________________________________________" >> ${CLOG} + echo -e "${SELF}: Running ./${s} ${PASSED_OPTIONS}..." >> ${CLOG} + echo -e "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" >> ${CLOG} T1=`date '+%s'` set +e ./${s} ${PASSED_OPTIONS} &>> ${CLOG}