From owner-svn-src-stable-10@freebsd.org  Mon Nov  2 22:03:26 2015
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 02214A25876;
 Mon,  2 Nov 2015 22:03:26 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 C24221AF0;
 Mon,  2 Nov 2015 22:03:25 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA2M3OQ9076431;
 Mon, 2 Nov 2015 22:03:24 GMT (envelope-from dteske@FreeBSD.org)
Received: (from dteske@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA2M3OMA076430;
 Mon, 2 Nov 2015 22:03:24 GMT (envelope-from dteske@FreeBSD.org)
Message-Id: <201511022203.tA2M3OMA076430@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dteske set sender to
 dteske@FreeBSD.org using -f
From: Devin Teske <dteske@FreeBSD.org>
Date: Mon, 2 Nov 2015 22:03:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r290286 - stable/10/usr.sbin/bsdinstall/scripts
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Nov 2015 22:03:26 -0000

Author: dteske
Date: Mon Nov  2 22:03:24 2015
New Revision: 290286
URL: https://svnweb.freebsd.org/changeset/base/290286

Log:
  MFC r287692: Better to reset trap and explicitly exit success

Modified:
  stable/10/usr.sbin/bsdinstall/scripts/script
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/bsdinstall/scripts/script
==============================================================================
--- stable/10/usr.sbin/bsdinstall/scripts/script	Mon Nov  2 22:02:35 2015	(r290285)
+++ stable/10/usr.sbin/bsdinstall/scripts/script	Mon Nov  2 22:03:24 2015	(r290286)
@@ -129,7 +129,8 @@ bsdinstall umount
 
 f_dprintf "Installation Completed at %s" "$( date )"
 
-trap true EXIT
+trap - EXIT
+exit $SUCCESS
 
 ################################################################################
 # END