Date: Thu, 21 Sep 2017 10:13:48 +0000 (UTC) From: Nick Hibma <n_hibma@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r323855 - head/tools/tools/nanobsd Message-ID: <201709211013.v8LADmMj072833@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 )
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709211013.v8LADmMj072833>