Index: /branches/releng-9.0/nanobsd/cfg/nanobsd.wleiden
===================================================================
--- /branches/releng-9.0/nanobsd/cfg/nanobsd.wleiden	(revision 10834)
+++ /branches/releng-9.0/nanobsd/cfg/nanobsd.wleiden	(revision 10835)
@@ -304,5 +304,6 @@
 	# Make sure to enable /dev as easy_install requires it for example
 	mount -t devfs devfs ${NANO_WORLDDIR}/dev
-        trap "umount ${NANO_WORLDDIR}/dev" 1 2 3 15
+        trap "umount ${NANO_WORLDDIR}/dev" 0
+        trap "exit 1" 1 2 3 15
 
 	# Copy packages into chroot
@@ -350,5 +351,4 @@
         # Return normal trap behaviour
         trap - 1 2 3 15 
-        umount ${NANO_WORLDDIR}/dev
 )