commit 8515b7e0906147791ebb4002db5ade16f1d5cc03
author Matt Stark <msta@google.com> Thu Jan 28 03:21:40 2021 +0000
committer Commit Bot <commit-bot@chromium.org> Fri Jan 29 09:49:21 2021 +0000
tree 449a5b0e72ca277886f073c122f2d5513e2aab20
parent b4e2156bdf2cabc41fbd1475fa4ec395ec939038

enter_chroot: Fix chrome_root being silently ignored if it was invalid.

BUG=chromium:1171574
TEST=Confirmed that it works correctly with no argument, valid argument,
and invalid arguments.

Change-Id: I403bc07bf1e1dab3df4f0dd8d03e20d2b4e3777d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosutils/+/2653446
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Matt Stark <msta@google.com>
Commit-Queue: Matt Stark <msta@google.com>
Tested-by: Matt Stark <msta@google.com>
Auto-Submit: Matt Stark <msta@google.com>

sdk_lib/enter_chroot.sh

diff --git a/sdk_lib/enter_chroot.sh b/sdk_lib/enter_chroot.sh
index cc82688..b49c827 100755
--- a/sdk_lib/enter_chroot.sh
+++ b/sdk_lib/enter_chroot.sh
@@ -566,7 +566,11 @@
       done < <(sed -e 's:#.*::' "${local_mounts}")
     fi
 
-    CHROME_ROOT="$(readlink -f "$FLAGS_chrome_root" || :)"
+    if [[ -n "${FLAGS_chrome_root}" ]]; then
+      if ! CHROME_ROOT="$(readlink -f "${FLAGS_chrome_root}")"; then
+        die_notrace "${FLAGS_chrome_root} does not exist."
+      fi
+    fi
     if [ -z "$CHROME_ROOT" ]; then
       CHROME_ROOT="$(cat "${FLAGS_chroot}${CHROME_ROOT_CONFIG}" \
         2>/dev/null || :)"