From owner-svn-src-all@freebsd.org Thu Sep 21 10:13:49 2017 Return-Path: Delivered-To: svn-src-all@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 B315EE21F8E; Thu, 21 Sep 2017 10:13:49 +0000 (UTC) (envelope-from n_hibma@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 80920728E5; Thu, 21 Sep 2017 10:13:49 +0000 (UTC) (envelope-from n_hibma@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8LADmBT072835; Thu, 21 Sep 2017 10:13:48 GMT (envelope-from n_hibma@FreeBSD.org) Received: (from n_hibma@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8LADmMj072833; Thu, 21 Sep 2017 10:13:48 GMT (envelope-from n_hibma@FreeBSD.org) Message-Id: <201709211013.v8LADmMj072833@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: n_hibma set sender to n_hibma@FreeBSD.org using -f From: Nick Hibma Date: Thu, 21 Sep 2017 10:13:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r323855 - head/tools/tools/nanobsd X-SVN-Group: head X-SVN-Commit-Author: n_hibma X-SVN-Commit-Paths: head/tools/tools/nanobsd X-SVN-Commit-Revision: 323855 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Thu, 21 Sep 2017 10:13:49 -0000 Author: n_hibma Date: Thu Sep 21 10:13:48 2017 New Revision: 323855 URL: https://svnweb.freebsd.org/changeset/base/323855 Log: Remove an 'unused' function. This function was only set in legacy.sh and only at the very end after the disk image had been successfully created. The only difference will be that the message 'Error encountered. Please check...' will not appear if nanobsd.sh exits with an error after the disk image has been created. Modified: head/tools/tools/nanobsd/defaults.sh head/tools/tools/nanobsd/legacy.sh Modified: head/tools/tools/nanobsd/defaults.sh ============================================================================== --- head/tools/tools/nanobsd/defaults.sh Thu Sep 21 10:10:42 2017 (r323854) +++ head/tools/tools/nanobsd/defaults.sh Thu Sep 21 10:13:48 2017 (r323855) @@ -291,11 +291,6 @@ CR0 ( ) { chroot "${NANO_WORLDDIR}" /bin/sh -c "$*" || true } -nano_cleanup ( ) ( - [ $? -eq 0 ] || echo "Error encountered. Check for errors in last log file." 1>&2 - exit $? -) - clean_build ( ) ( pprint 2 "Clean and create object directory (${MAKEOBJDIRPREFIX})" Modified: head/tools/tools/nanobsd/legacy.sh ============================================================================== --- head/tools/tools/nanobsd/legacy.sh Thu Sep 21 10:10:42 2017 (r323854) +++ head/tools/tools/nanobsd/legacy.sh Thu Sep 21 10:13:48 2017 (r323855) @@ -198,7 +198,6 @@ create_diskimage ( ) ( mdconfig -d -u $MD trap - 1 2 15 - trap nano_cleanup EXIT ) > ${NANO_LOG}/_.di 2>&1 )