--- trunk/bootstrap/mage-bootstrap.sh.in	2014/02/04 12:05:43	2586
+++ trunk/bootstrap/mage-bootstrap.sh.in	2014/02/06 13:05:57	2587
@@ -79,13 +79,15 @@
 
 enter_chroot()
 {
-	mount -t proc proc ${MROOT}/proc || die "mount proc"
-	mount -t sysfs sysfs ${MROOT}/sys || die "mount sys"
-	mount -o bind /dev ${MROOT}/dev || die "mount dev"
+	is_loc_mounted "${MROOT}/proc" || mount -t proc proc ${MROOT}/proc
+	is_loc_mounted "${MROOT}/sys" || mount -t sysfs sysfs ${MROOT}/sys
+	is_loc_mounted "${MROOT}/dev" || mount -o bind /dev ${MROOT}/dev
 
 	chroot ${MROOT} /bin/bash -i /.installrc || die "chr00ting"
 
-	umount ${MROOT}/dev ${MROOT}/sys ${MROOT}/proc || die "mount proc/sys/dev"
+	is_loc_mounted "${MROOT}/dev" && umount ${MROOT}/dev
+	is_loc_mounted "${MROOT}/sys" && umount ${MROOT}/sys
+	is_loc_mounted "${MROOT}/proc" && umount ${MROOT}/proc
 
 	[ -f ${MROOT}/.installrc ] && rm ${MROOT}/.installrc
 }