diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-02-17 16:06:52 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-02-17 16:09:45 +0000 |
| commit | 534c72b9b2e0932a2875511ec401332703365e18 (patch) | |
| tree | fc31069a5cac370018c7c3276e4db8fc70827c35 /baserock-bootstrap | |
| parent | 5882cdc3cc759b0d5879b231c2917e8cff754c5c (diff) | |
| download | morph-534c72b9b2e0932a2875511ec401332703365e18.tar.gz | |
baserock-bootstrap: always recreate do-chroot
if it doesn't get replaced then a command may
try to use /tools/bin/env
Diffstat (limited to 'baserock-bootstrap')
| -rwxr-xr-x | baserock-bootstrap | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/baserock-bootstrap b/baserock-bootstrap index 41f7afaa..c11e88b9 100755 --- a/baserock-bootstrap +++ b/baserock-bootstrap @@ -809,8 +809,7 @@ done EOF $HOST_CHMOD +x "$LFS/baserock/build.sh" local do_chroot="$BASEDIR/do-chroot.bash" - if [ ! -e "$do_chroot" ]; then - $HOST_CAT <<EOF >"$do_chroot" + $HOST_CAT <<EOF >"$do_chroot" #!/bin/bash trap "$HOST_SUDO umount $LFS/proc $LFS/sys" INT TERM EXIT set -e @@ -830,8 +829,7 @@ $HOST_SUDO /usr/sbin/chroot "$LFS" \\ BOOTSTRAP_TOOLS="$LFS/tools" \\ "\${@-\$SHELL}" EOF - $HOST_CHMOD +x "$do_chroot" - fi + $HOST_CHMOD +x "$do_chroot" "$do_chroot" /baserock/build.sh } @@ -864,8 +862,7 @@ python ./morph --verbose build \ EOF $HOST_CHMOD +x "$LFS/baserock/build.sh" local do_chroot="$BASEDIR/do-chroot.bash" - if [ ! -e "$do_chroot" ]; then - $HOST_CAT <<EOF >"$do_chroot" + $HOST_CAT <<EOF >"$do_chroot" #!/bin/bash trap "$HOST_SUDO umount $LFS/proc $LFS/sys" INT TERM EXIT set -e @@ -885,8 +882,7 @@ $HOST_SUDO /usr/sbin/chroot "$LFS" \\ BOOTSTRAP_TOOLS="$LFS/tools" \\ "\${@-\$SHELL}" EOF - $HOST_CHMOD +x "$do_chroot" - fi + $HOST_CHMOD +x "$do_chroot" "$do_chroot" /baserock/build.sh } @@ -994,8 +990,7 @@ done EOF $HOST_CHMOD +x "$LFS/baserock/build.sh" local do_chroot="$BASEDIR/do-chroot.bash" - if [ ! -e "$do_chroot" ]; then - $HOST_CAT <<EOF >"$do_chroot" + $HOST_CAT <<EOF >"$do_chroot" #!/bin/bash trap "$HOST_SUDO umount $LFS/proc $LFS/sys" INT TERM EXIT set -e @@ -1014,8 +1009,7 @@ $HOST_SUDO /usr/sbin/chroot "$LFS" \\ PATH="/bin:/usr/bin:/sbin:/usr/sbin" \\ "\${@-\$SHELL}" EOF - $HOST_CHMOD +x "$do_chroot" - fi + $HOST_CHMOD +x "$do_chroot" "$do_chroot" /baserock/build.sh } pass3_build_with_morph_in_chroot() |