From 9e5b0a43ba72b11fd9cbc2207da25da2d6c69ea1 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@chromium.org>
Date: Wed, 16 May 2012 17:30:24 -0400
Subject: [PATCH] enter_chroot: use /proc/mounts rather than `mount`

Since /etc/mtab could be stale, use /proc/mounts instead.

BUG=None
TEST=`cros_sdk` in diff terminals still works

Change-Id: I526e5173581820c6983fe3702493a0349c1232c3
Reviewed-on: https://gerrit.chromium.org/gerrit/22860
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
---
 sdk_lib/enter_chroot.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sdk_lib/enter_chroot.sh b/sdk_lib/enter_chroot.sh
index 5846dc185b..b7f8621a5f 100755
--- a/sdk_lib/enter_chroot.sh
+++ b/sdk_lib/enter_chroot.sh
@@ -109,8 +109,8 @@ queue_mount() {
 
   local mounted_path="${MOUNTED_PATH}$target"
 
-  case ${MOUNT_CACHE} in
-  *" on ${mounted_path} "*)
+  case " ${MOUNT_CACHE} " in
+  *" ${mounted_path} "*)
     # Already mounted!
     ;;
   *)
@@ -251,7 +251,7 @@ setup_env() {
     fi
 
     debug "Mounting chroot environment."
-    MOUNT_CACHE=$(mount)
+    MOUNT_CACHE=$(echo $(awk '{print $2}' /proc/mounts))
     mount_queue_init
     queue_mount none "-t proc" /proc
     queue_mount none "-t sysfs" /sys