svn commit: r339609 - in head/release: amd64 i386 powerpc sparc64

[Oliver Pinter]

On 10/22/18, Ed Maste <emaste at freebsd.org> wrote:
> Author: emaste
> Date: Mon Oct 22 19:39:20 2018
> New Revision: 339609
> URL: https://svnweb.freebsd.org/changeset/base/339609
>
> Log:
>   release: set -e to exit on error in iso image scripts
>
>   Reviewed by:	gjb
>   Differential Revision:	https://reviews.freebsd.org/D17651
>
> Modified:
>   head/release/amd64/mkisoimages.sh
>   head/release/i386/mkisoimages.sh
>   head/release/powerpc/mkisoimages.sh
>   head/release/sparc64/mkisoimages.sh
>
> Modified: head/release/amd64/mkisoimages.sh

This commit catches an warning / error in cd generation for amd64,
with this error:

>>> Installing everything completed on Mon Oct 22 18:07:00 UTC 2018
--------------------------------------------------------------
1+0 records in
1+0 records out
4096 bytes transferred in 0.000197 secs (20757002 bytes/sec)
200+0 records in
200+0 records out
819200 bytes transferred in 0.020971 secs (39064121 bytes/sec)
newfs_msdos: cannot get number of sectors per track: Operation not supported
newfs_msdos: cannot get number of heads: Operation not supported
newfs_msdos: trim 25 sectors to adjust to a multiple of 63
/dev/md0: 1532 sectors in 1532 FAT12 clusters (512 bytes/cluster)
BytesPerSec=512 SecPerClust=1 ResSectors=1 FATs=2 RootDirEnts=512
Sectors=1575 Media=0xf8 FATsecs=5 SecPerTrack=63 Heads=1 HiddenSecs=0
cp: chown: efi/efi/boot/bootx64.efi: Invalid argument
1+0 records in
1+0 records out

The last working cd generation was before this commit:
https://jenkins.hardenedbsd.org/jenkins/job/HardenedBSD-CURRENT-amd64/1361/console

And after this commit it breaks on the above line:
https://jenkins.hardenedbsd.org/jenkins/job/HardenedBSD-CURRENT-amd64/

in ${SRCTOP}/release/amd64/mkisoimages.sh the -p option can't work
when you copy to a FAT FS, so the easiest fix would be to remove the
-p option from cp's line.
Other problem with a script after the set -e changes, that if
something fails, no one cleans up the created md devices.


> ==============================================================================
> --- head/release/amd64/mkisoimages.sh	Mon Oct 22 18:41:22 2018	(r339608)
> +++ head/release/amd64/mkisoimages.sh	Mon Oct 22 19:39:20 2018	(r339609)
> @@ -23,6 +23,8 @@
>  # extra-bits-dir, if provided, contains additional files to be merged
>  # into base-bits-dir as part of making the image.
>
> +set -e
> +
>  if [ -z $ETDUMP ]; then
>  	ETDUMP=etdump
>  fi
>
> Modified: head/release/i386/mkisoimages.sh
> ==============================================================================
> --- head/release/i386/mkisoimages.sh	Mon Oct 22 18:41:22 2018	(r339608)
> +++ head/release/i386/mkisoimages.sh	Mon Oct 22 19:39:20 2018	(r339609)
> @@ -23,6 +23,8 @@
>  # extra-bits-dir, if provided, contains additional files to be merged
>  # into base-bits-dir as part of making the image.
>
> +set -e
> +
>  if [ "$1" = "-b" ]; then
>  	# This is highly x86-centric and will be used directly below.
>  	bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"
>
> Modified: head/release/powerpc/mkisoimages.sh
> ==============================================================================
> --- head/release/powerpc/mkisoimages.sh	Mon Oct 22 18:41:22 2018	(r339608)
> +++ head/release/powerpc/mkisoimages.sh	Mon Oct 22 19:39:20 2018	(r339609)
> @@ -23,6 +23,7 @@
>  # extra-bits-dir, if provided, contains additional files to be merged
>  # into base-bits-dir as part of making the image.
>
> +set -e
>
>  if [ "$1" = "-b" ]; then
>  	bootable=1
>
> Modified: head/release/sparc64/mkisoimages.sh
> ==============================================================================
> --- head/release/sparc64/mkisoimages.sh	Mon Oct 22 18:41:22 2018	(r339608)
> +++ head/release/sparc64/mkisoimages.sh	Mon Oct 22 19:39:20 2018	(r339609)
> @@ -22,6 +22,8 @@
>  # resulting ISO image, base-bits-dir contains the image contents and
>  # extra-bits-dir, if provided, contains additional files to be merged
>  # into base-bits-dir as part of making the image.
> +set -e
> +
>  if [ $# -lt 3 ]; then
>  	echo "Usage: $0 [-b] image-label image-name base-bits-dir
> [extra-bits-dir]" > /dev/stderr
>  	exit 1
> _______________________________________________
> svn-src-head at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscribe at freebsd.org"
>