From 49e99e698740e564930120f7efd100eaa7bc74fa Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sun, 8 Aug 2010 23:40:20 -0500 Subject: [PATCH] script/makeworld: clarify error message; avoid double-cleanup --- script/makeworld | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/script/makeworld b/script/makeworld index 2ee8046..320c8de 100755 --- a/script/makeworld +++ b/script/makeworld @@ -91,6 +91,7 @@ cleanup() { mount | grep -q "${build}" && wtf "Stuff is still mounted under ${build}; not removing" chflags -R noschg "${build}" rm -Rf "${build}" + trap "" exit hup int term kill } if [ -d "${build}" ] @@ -111,7 +112,7 @@ for phase in buildworld buildkernel distrib-dirs installworld installkernel dist do meh "==> Phase: ${phase}" script "${world}/${date}-${phase}.log" chroot "${build}" sh -c \ - "cd /usr/src; time make ${MAKEOPTS} ${phase} TARGET=${TARGET} KERNCONF=${CONFIG} DESTDIR=/mnt" || wtf + "cd /usr/src; time make ${MAKEOPTS} ${phase} TARGET=${TARGET} KERNCONF=${CONFIG} DESTDIR=/mnt" || wtf "chroot-cmd ${phase}" done # Copy the config files into the target, to keep a record of the build options -- 2.42.0