diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-02-16 18:26:55 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-02-16 20:30:16 +0000 |
| commit | 5ecacb63a5931249cc6bf403ee7f793361c76d0c (patch) | |
| tree | d3d01cb020c18674dd2816d24ff826f8d1b7c352 /run-bootstrap-in-chroot | |
| parent | b8172ce6b376e40100055bc22f8a09f02286c04f (diff) | |
| download | morph-5ecacb63a5931249cc6bf403ee7f793361c76d0c.tar.gz | |
Update morph and related stuff after unpacking a snapshot
Diffstat (limited to 'run-bootstrap-in-chroot')
| -rwxr-xr-x | run-bootstrap-in-chroot | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/run-bootstrap-in-chroot b/run-bootstrap-in-chroot index 0a798218..5b834ef6 100755 --- a/run-bootstrap-in-chroot +++ b/run-bootstrap-in-chroot @@ -25,6 +25,15 @@ has_pass() fi } +update_morph() +{ + local dir="$1" + cp baserock-bootstrap "$dir/." # update bootstrap script + rm -rf "$dir/tree/baserock/gits/morph" + mkdir -p "$dir/tree/baserock/gits/morph" + cp -r . "$dir/tree/baserock/gits/morph/." +} + run_pass() { local dir="$1" @@ -34,9 +43,9 @@ run_pass() if has_pass "$passname" then tar -C "$dir" -xf "$tarball" - cp baserock-bootstrap "$dir/." # update bootstrap script + update_morph "$dir" else - cp baserock-bootstrap "$dir/." + update_morph "$dir" "./do-squeeze-chroot" bash -x baserock-bootstrap "$passname" || exit 1 if "$snapshot" then @@ -125,13 +134,6 @@ then fi -# Update the git repos. -mkdir -p "$dir/tree/baserock" -rm -rf "$dir/tree/baserock/gits" -mkdir "$dir/tree/baserock/gits" -mkdir "$dir/tree/baserock/gits/morph" -cp -r . "$dir/tree/baserock/gits/morph/." - if ! has_pass pass2b then run_pass "$dir" pass2a |