diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-21 02:58:34 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-21 02:58:34 +0000 |
| commit | d0debcc8ea135cec1fd279d4c48f8ce59e7758c4 (patch) | |
| tree | 4cb4bd1bd7e7558a749d649ca5ef1c6327664bad /build/install-chroot.sh | |
| parent | 060f76d553788c941f33e27e46daa159b069cb58 (diff) | |
| download | chromium_src-d0debcc8ea135cec1fd279d4c48f8ce59e7758c4.zip chromium_src-d0debcc8ea135cec1fd279d4c48f8ce59e7758c4.tar.gz chromium_src-d0debcc8ea135cec1fd279d4c48f8ce59e7758c4.tar.bz2 | |
Mount /run and /run/shm in chroots.
When running layout tests, we need /run/shm. Previously we wouldn't
install it because the chroot didn't have /run. Now we will mount
/run and /run/shm in the chroot.
BUG=166632
Review URL: https://chromiumcodereview.appspot.com/11649050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174326 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/install-chroot.sh')
| -rwxr-xr-x | build/install-chroot.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/build/install-chroot.sh b/build/install-chroot.sh index af85fb1..e49726d 100755 --- a/build/install-chroot.sh +++ b/build/install-chroot.sh @@ -392,12 +392,16 @@ if [ -d /media ] && sudo sh -c 'cat >>/etc/schroot/mount-'"${target}" fi -# Share /dev/shm and possibly /run/shm +# Share /dev/shm, /run and /run/shm. grep -qs '^/dev/shm' /etc/schroot/mount-"${target}" || echo '/dev/shm /dev/shm none rw,bind 0 0' | sudo sh -c 'cat >>/etc/schroot/mount-'"${target}" -if [ -d "/var/lib/chroot/${target}/run" ] && - ! grep -qs '^/run/shm' /etc/schroot/mount-"${target}"; then +if [ ! -d "/var/lib/chroot/${target}/run" ] && + ! grep -qs '^/run' /etc/schroot/mount-"${target}"; then + echo '/run /run none rw,bind 0 0' | + sudo sh -c 'cat >>/etc/schroot/mount-'"${target}" +fi +if ! grep -qs '^/run/shm' /etc/schroot/mount-"${target}"; then { [ -d /run ] && echo '/run/shm /run/shm none rw,bind 0 0' || echo '/dev/shm /run/shm none rw,bind 0 0'; } | sudo sh -c 'cat >>/etc/schroot/mount-'"${target}" |