From owner-svn-src-all@freebsd.org Sun Nov 4 22:09:38 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0E5CF10EEB6A for ; Sun, 4 Nov 2018 22:09:38 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-yw1-xc2f.google.com (mail-yw1-xc2f.google.com [IPv6:2607:f8b0:4864:20::c2f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 723B78A0A5 for ; Sun, 4 Nov 2018 22:09:36 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-yw1-xc2f.google.com with SMTP id k6-v6so2906932ywa.11 for ; Sun, 04 Nov 2018 14:09:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=flseR0bxkbgGjzyaaLoP6yPLJUGvNz3VN0SLeod+q/E=; b=G4gQQWSPm9kcCxMn3eKT7SLDdnu75cQoRkRecKyIEBYwWunTizOnn/22voitAzWEzG 2KwT4ZJH28YheB4a2VrV5P/Od1quiy4uAwXbTzYw85COR8/CSEH7fUzoHEuSrAdCR7K9 xyfoaQiGDnJ/x2ugWtf8e+gA+pETLQPeTNlY4FdI7RUCRUysPUtfrcocHsjoqZqRb6zA uL1MGUadI2wXCSap8KDlaBdUT7NkJGoKqbKbjSTSIHQLDnOKxDy8ApuvTinlKCTVMk4h Z4TOZJQNHfizWQvdpjjD04dthr0qsCeBasTkFkISHxCnPgQiUOM8gEB49BZP4W1etYA6 uBUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=flseR0bxkbgGjzyaaLoP6yPLJUGvNz3VN0SLeod+q/E=; b=I9y1LhCCoFe6QJw0mLz64ZEogxoUaDh3sD2Bpzw47Tw4Ch8O/akVlyY5Mk1BoSYZC+ vMoAWw860iAFGj8AlqNyItUa+7uwQzg1gFpkiDOOV/R4/1Zjlzo/uZpmpZd1fC03UZmM KPuakggH+47mG9Ucj5ZihX/Sq4PB0CkS+eGdqTW+vkAUGKe7CGlNrlXhVm/ytXCZazVk Kh86sLmtSB68KHzyo4uN0xApVXMxU3FBiLoKXAuXRMrre9slm5i5CLQ+RAjVId9qV7XU qkZzJZ1ZzFpJ/4Cz45HYFCKVLkcn12Jr3Rk/UmLtA+YTN+uR6TePxgvHeaSLuV8ggpTQ MYvQ== X-Gm-Message-State: AGRZ1gK8efK/N4VVPnIcOPKZNEVaKlEmPRab9r05TyQD6ecuWoQHtb30 1cMVtaX/l9S1D/A7c5hIZb65Kd1CJdGzsuDQMMPmCg== X-Google-Smtp-Source: AJdET5dw84KVWx3FgUBIDYLbM/L+GVU3DFUN0uYi3o42eTYyi1n/p68MiP9LBhfoc/2JdsZrvJkjC5RKxwjTBPCOpQE= X-Received: by 2002:a0d:e081:: with SMTP id j123-v6mr18890224ywe.267.1541369375827; Sun, 04 Nov 2018 14:09:35 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a25:b901:0:0:0:0:0 with HTTP; Sun, 4 Nov 2018 14:09:35 -0800 (PST) In-Reply-To: <201810221939.w9MJdKiW071014@repo.freebsd.org> References: <201810221939.w9MJdKiW071014@repo.freebsd.org> From: Oliver Pinter Date: Sun, 4 Nov 2018 23:09:35 +0100 Message-ID: Subject: Re: svn commit: r339609 - in head/release: amd64 i386 powerpc sparc64 To: Ed Maste Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 723B78A0A5 X-Spamd-Result: default: False [-0.72 / 200.00]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[hardenedbsd.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[hardenedbsd.org]; TO_DN_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[hardenedbsd.org:+]; MX_GOOD(-0.01)[cached: alt1.aspmx.l.google.com]; RCVD_IN_DNSWL_NONE(0.00)[f.2.c.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; NEURAL_HAM_SHORT(-0.01)[-0.005,0]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-0.20)[ipnet: 2607:f8b0::/32(0.22), asn: 15169(-1.16), country: US(-0.07)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2018 22:09:38 -0000 On 10/22/18, Ed Maste 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@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" >