From owner-svn-src-projects@FreeBSD.ORG Wed Oct 29 16:20:50 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3BB19C91; Wed, 29 Oct 2014 16:20:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0E619FC6; Wed, 29 Oct 2014 16:20:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9TGKnxO020212; Wed, 29 Oct 2014 16:20:49 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9TGKnv3020208; Wed, 29 Oct 2014 16:20:49 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201410291620.s9TGKnv3020208@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 29 Oct 2014 16:20:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r273826 - in projects/release-vmimage/release: amd64 i386 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Oct 2014 16:20:50 -0000 Author: gjb Date: Wed Oct 29 16:20:49 2014 New Revision: 273826 URL: https://svnweb.freebsd.org/changeset/base/273826 Log: Remove a few vestiges of passing an exit code to panic(). Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/amd64/mk-azure.sh projects/release-vmimage/release/i386/mk-azure.sh Modified: projects/release-vmimage/release/amd64/mk-azure.sh ============================================================================== --- projects/release-vmimage/release/amd64/mk-azure.sh Wed Oct 29 16:18:29 2014 (r273825) +++ projects/release-vmimage/release/amd64/mk-azure.sh Wed Oct 29 16:20:49 2014 (r273826) @@ -78,7 +78,7 @@ vm_create_azure() { mount /dev/${mddev} ${DESTDIR} make -C ${WORLDDIR} DESTDIR=$(realpath ${DESTDIR}) \ installworld installkernel distribution || \ - panic 1 "\n\nCannot install the base system to ${DESTDIR}." + panic "\n\nCannot install the base system to ${DESTDIR}." mount -t devfs devfs ${DESTDIR}/dev chroot ${DESTDIR} /usr/bin/newaliases echo '# Custom /etc/fstab for FreeBSD VM images' \ @@ -125,7 +125,7 @@ vm_create_azure() { # This should never happen. But, it has happened. msg="Cannot umount(8) ${DESTDIR}\n" msg="${msg}Something has gone horribly wrong." - panic 1 "${msg}" + panic "${msg}" fi sleep 1 done Modified: projects/release-vmimage/release/i386/mk-azure.sh ============================================================================== --- projects/release-vmimage/release/i386/mk-azure.sh Wed Oct 29 16:18:29 2014 (r273825) +++ projects/release-vmimage/release/i386/mk-azure.sh Wed Oct 29 16:20:49 2014 (r273826) @@ -78,7 +78,7 @@ vm_create_azure() { mount /dev/${mddev} ${DESTDIR} make -C ${WORLDDIR} DESTDIR=$(realpath ${DESTDIR}) \ installworld installkernel distribution || \ - panic 1 "\n\nCannot install the base system to ${DESTDIR}." + panic "\n\nCannot install the base system to ${DESTDIR}." mount -t devfs devfs ${DESTDIR}/dev chroot ${DESTDIR} /usr/bin/newaliases echo '# Custom /etc/fstab for FreeBSD VM images' \ @@ -125,7 +125,7 @@ vm_create_azure() { # This should never happen. But, it has happened. msg="Cannot umount(8) ${DESTDIR}\n" msg="${msg}Something has gone horribly wrong." - panic 1 "${msg}" + panic "${msg}" fi sleep 1 done