diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-04-27 13:54:53 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-04-27 13:54:53 +0100 |
| commit | 6302b37667a7933c09068eb54774e0607553c8c9 (patch) | |
| tree | e1e2a29b8f1caba40b1c6667fe5552c7c21b508a /baserock-bootstrap | |
| parent | 59c6523a3725566a3c43544a34c3227e55f4f166 (diff) | |
| download | morph-6302b37667a7933c09068eb54774e0607553c8c9.tar.gz | |
bootstrap: don't fail on /tree/{sys,proc} unmount
Diffstat (limited to 'baserock-bootstrap')
| -rwxr-xr-x | baserock-bootstrap | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/baserock-bootstrap b/baserock-bootstrap index 478b44e1..2ae08fa7 100755 --- a/baserock-bootstrap +++ b/baserock-bootstrap @@ -184,7 +184,7 @@ EOF local do_chroot="$BASEDIR/do-chroot.bash" $HOST_CAT <<EOF >"$do_chroot" #!/bin/bash -trap "umount $LFS/proc $LFS/sys" INT TERM EXIT +trap "umount $LFS/proc $LFS/sys || true" INT TERM EXIT set -e set -x if ! mount | grep "$LFS/proc" >/dev/null @@ -234,7 +234,7 @@ EOF local do_chroot="$BASEDIR/do-chroot.bash" $HOST_CAT <<EOF >"$do_chroot" #!/bin/bash -trap "umount $LFS/proc $LFS/sys" INT TERM EXIT +trap "umount $LFS/proc $LFS/sys || true" INT TERM EXIT set -e set -x if ! mount | grep "$LFS/proc" >/dev/null @@ -271,7 +271,7 @@ EOF local do_chroot="$BASEDIR/do-chroot.bash" $HOST_CAT <<EOF >"$do_chroot" #!/bin/bash -trap "umount $LFS/proc $LFS/sys" INT TERM EXIT +trap "umount $LFS/proc $LFS/sys || true" INT TERM EXIT set -e set -x if ! mount | grep "$LFS/proc" >/dev/null @@ -351,7 +351,7 @@ EOF local do_chroot="$BASEDIR/do-chroot.bash" $HOST_CAT <<EOF >"$do_chroot" #!/bin/bash -trap "umount $LFS/proc $LFS/sys" INT TERM EXIT +trap "umount $LFS/proc $LFS/sys || true" INT TERM EXIT set -e set -x if ! mount | grep "$LFS/proc" >/dev/null @@ -402,7 +402,7 @@ EOF local do_chroot="$BASEDIR/do-chroot.bash" $HOST_CAT >"$do_chroot" <<EOF #!/bin/bash -trap "umount $LFS/proc $LFS/sys" INT TERM EXIT +trap "umount $LFS/proc $LFS/sys || true" INT TERM EXIT set -e set -x if ! mount | grep "$LFS/proc" >/dev/null @@ -440,7 +440,7 @@ EOF local do_chroot="$BASEDIR/do-chroot.bash" $HOST_CAT >"$do_chroot" <<EOF #!/bin/bash -trap "umount $LFS/proc $LFS/sys" INT TERM EXIT +trap "umount $LFS/proc $LFS/sys || true" INT TERM EXIT set -e set -x if ! mount | grep "$LFS/proc" >/dev/null |