--- /usr/lib/catalyst/modules/generic_stage_target.py	2006-04-04 11:35:48.000000000 +0100
+++ generic_stage_target.py	2006-04-04 11:38:00.000000000 +0100
@@ -302,6 +302,8 @@
 				    ouch=1
 				    warn("Couldn't umount bind mount: "+mypath+x)
 				    # keep trying to umount the others, to minimize damage if developer makes a mistake
+				else:
+				    ouch=0
 
 		if ouch:
 			"""

--- /usr/lib/catalyst/targets/support/kill-chroot-pids.sh       2006-04-04 11:35:48.000000000 +0100
+++ kill-chroot-pids.sh 2006-04-04 11:38:07.000000000 +0100
@@ -56,3 +56,5 @@
            kill -9 ${pid}
     done
 fi
+
+sleep 10