summaryrefslogtreecommitdiff
path: root/run-bootstrap-in-chroot
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-01-20 18:31:12 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-01-20 18:31:12 +0000
commit12d11775351e5b07dddeae4220712d2e8d137568 (patch)
tree2a96d5044692cb72e54076c6e8fa751c70cc26d8 /run-bootstrap-in-chroot
parent9802067cc454f516768ab59a6ba976a9d3b0dcba (diff)
downloadmorph-12d11775351e5b07dddeae4220712d2e8d137568.tar.gz
Actually run pass2
Also, unmount virtual filesystems using the shell function for it.
Diffstat (limited to 'run-bootstrap-in-chroot')
-rwxr-xr-xrun-bootstrap-in-chroot6
1 files changed, 3 insertions, 3 deletions
diff --git a/run-bootstrap-in-chroot b/run-bootstrap-in-chroot
index 0dcbaa9c..2cd74cea 100755
--- a/run-bootstrap-in-chroot
+++ b/run-bootstrap-in-chroot
@@ -28,8 +28,8 @@ else
fi
mirror="http://192.168.1.185/debian"
-umount "$dir/proc" || true
-umount "$dir/sys" || true
+
+unmount_virtual "$dir"
rm -rf "$dir"
mkdir "$dir"
@@ -86,7 +86,7 @@ cp -rl "$HOME/baserock/gits" "$dir/tree/baserock/gits"
cp baserock-bootstrap "$dir/."
sed 's,^.*/,http://192.168.1.185/lfs/,' wget-list > "$dir/wget-list"
if mount_virtual "$dir" &&
- chroot "$dir" bash -x baserock-bootstrap yes &&
+ chroot "$dir" bash -x baserock-bootstrap no &&
unmount_virtual "$dir"
then
: