summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authormmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-29 22:08:46 +0000
committermmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-29 22:08:46 +0000
commitb24c3dc2a27f62eafb54b86f716db92c39b3cba0 (patch)
tree75bccc314e4fe607de610800c40edd6e5b74dac4 /build
parent42501060cea442c3eeddfed2b3c8f7458ed511ea (diff)
downloadchromium_src-b24c3dc2a27f62eafb54b86f716db92c39b3cba0.zip
chromium_src-b24c3dc2a27f62eafb54b86f716db92c39b3cba0.tar.gz
chromium_src-b24c3dc2a27f62eafb54b86f716db92c39b3cba0.tar.bz2
Make chroot setup work better with NFS home dirs.
BUG=none TEST=install-chroot.sh works on Google corp machines. Review URL: http://codereview.chromium.org/9500022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124265 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rwxr-xr-xbuild/install-chroot.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/build/install-chroot.sh b/build/install-chroot.sh
index b80aea0..0464cd2 100755
--- a/build/install-chroot.sh
+++ b/build/install-chroot.sh
@@ -1,6 +1,6 @@
#!/bin/bash -e
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -203,7 +203,9 @@ EOF
sed '/^FSTAB=/s,/mount-defaults",/mount-'"${target}"'",' \
/etc/schroot/script-defaults |
sudo sh -c 'cat >/etc/schroot/script-'"${target}"
-sudo cp /etc/schroot/mount-defaults /etc/schroot/mount-"${target}"
+sed '\,^/home[/[:space:]],s/\([,[:space:]]\)bind[[:space:]]/\1rbind /' \
+ /etc/schroot/mount-defaults |
+ sudo sh -c 'cat > /etc/schroot/mount-'"${target}"
echo "$HOME/chroot/.${target} $HOME/chroot none rw,bind 0 0" |
sudo sh -c 'cat >>/etc/schroot/mount-'"${target}"
mkdir -p "$HOME/chroot/.${target}"