Fix egrep for checking for rw/ro.

Right now we're not fixing symlinks because mount_gpt_image thinks it's mounted ro.

Change-Id: Ie61536cd8d7bc276831c488e7ab892db14b05a94

BUG=8116
TEST=Mounted image from device and locally with both rw, and ro options.

Review URL: http://codereview.chromium.org/4048006
This commit is contained in:
Chris Sosa 2010-10-25 13:21:42 -07:00
parent e2dae7e751
commit 3b44f34de7

View File

@ -47,7 +47,7 @@ function unmount_image() {
# Don't die on error to force cleanup # Don't die on error to force cleanup
set +e set +e
# Reset symlinks in /usr/local. # Reset symlinks in /usr/local.
if mount | grep "${FLAGS_rootfs_mountpt} (rw,bind)"; then if mount | egrep ".* ${FLAGS_rootfs_mountpt} .*\(rw,"; then
setup_symlinks_on_root "/usr/local" "/var" \ setup_symlinks_on_root "/usr/local" "/var" \
"${FLAGS_stateful_mountpt}" "${FLAGS_stateful_mountpt}"
fix_broken_symlinks "${FLAGS_rootfs_mountpt}" fix_broken_symlinks "${FLAGS_rootfs_mountpt}"