diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-01-20 13:11:17 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-01-20 13:11:17 +0000 |
| commit | 66b4c9ff1d35ff3209419a002043beb66b97075e (patch) | |
| tree | 2656bd1a2c6014442c95c77b76499436a82ed502 /run-bootstrap-in-chroot | |
| parent | 95c0dfaa60c4e77eaf1c17da9c8ec4ce752749b3 (diff) | |
| download | morph-66b4c9ff1d35ff3209419a002043beb66b97075e.tar.gz | |
Keep proc, sys mounted only during chroot runs
Diffstat (limited to 'run-bootstrap-in-chroot')
| -rwxr-xr-x | run-bootstrap-in-chroot | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/run-bootstrap-in-chroot b/run-bootstrap-in-chroot index bb1b51c5..eca64799 100755 --- a/run-bootstrap-in-chroot +++ b/run-bootstrap-in-chroot @@ -2,6 +2,18 @@ set -e +mount_virtual() +{ + mount -t proc proc "$1/proc" + mount -t sysfs sysfs "$1/sys" +} + +unmount_virtual() +{ + umount "$1/proc" || true + umount "$1/sys" || true +} + export LC_ALL=C if [ "x$1" = x ] @@ -47,8 +59,6 @@ cp baserock-bootstrap "$dir/." mkdir -p "$dir/tree/baserock" cp -r "$HOME/baserock/gits" "$dir/tree/baserock/gits" sed 's,^.*/,http://192.168.1.185/lfs/,' wget-list > "$dir/wget-list" -mount -t proc proc "$dir/proc" -mount -t sysfs sysfs "$dir/sys" if [ "$snapshot" = yes ] && [ -e "$snapshotdir/pass1-snapshot.tar" ] then @@ -60,15 +70,14 @@ then fi elif [ "$snapshot" = yes ] then - if chroot "$dir" bash -x baserock-bootstrap yes + if mount_virtual "$dir" && chroot "$dir" bash -x baserock-bootstrap yes && + unmount_virtual "$dir" then - if umount "$dir/proc" && - umount "$dir/sys" && - tar -C "$dir" -caf "$snapshotdir/pass1-snapshot.tar" . - mount -t proc proc "$dir/proc" && - mount -t proc proc "$dir/proc" + if tar -C "$dir" -caf "$snapshotdir/pass1-snapshot.tar" . then - if chroot "$dir" bash -x baserock-bootstrap no + if mount_virtual "$dir" && + chroot "$dir" bash -x baserock-bootstrap no && + unmount_virtual "$dir" then exit=0 else @@ -81,7 +90,9 @@ then exit=$? fi else - if chroot "$dir" bash -x baserock-bootstrap no + if mount_virtual "$dir" && + chroot "$dir" bash -x baserock-bootstrap no && + unmount_virtual "$dir" then exit=0 else @@ -89,13 +100,15 @@ else fi fi -if [ "$exit" = 0 ] && chroot "$dir" bash -x baserock-bootstrap no +if [ "$exit" = 0 ] && + mount_virtual "$dir" && + chroot "$dir" bash -x baserock-bootstrap no && + unmount_virtual "$dir" then exit=0 else exit=$? fi -umount "$dir/sys" -umount "$dir/proc" +unmount_virtual "$dir" exit $exit |