summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@chromium.org>2014-10-06 01:18:51 -0400
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-10-07 05:54:06 +0000
commit2b802de836e90ae65f3ea4ef391b6df2fc28aba3 (patch)
treea5d5f3b4ea91e62d9e5458ec6c52c689a7a57b36
parent782300d093a2fbf2ca24e446fb6d65f9f28e56a6 (diff)
downloadvboot-2b802de836e90ae65f3ea4ef391b6df2fc28aba3.tar.gz
image_signing: ignore missing chrome_dev.conf
If we try to sign an image w/out Chrome, this file won't exist. Run grep with the -s flag to silence those warnings. BUG=chromium:418817 TEST=`cbuildbot storm-release` no longer warns BRANCH=None Change-Id: Ibac0978e3e4d9f89c00206a2dd21c1d71544f710 Reviewed-on: https://chromium-review.googlesource.com/221184 Reviewed-by: Gaurav Shah <gauravsh@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org> Commit-Queue: Mike Frysinger <vapier@chromium.org>
-rwxr-xr-xscripts/image_signing/ensure_no_nonrelease_files.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/image_signing/ensure_no_nonrelease_files.sh b/scripts/image_signing/ensure_no_nonrelease_files.sh
index e40aadab..339e5fe9 100755
--- a/scripts/image_signing/ensure_no_nonrelease_files.sh
+++ b/scripts/image_signing/ensure_no_nonrelease_files.sh
@@ -51,7 +51,7 @@ main() {
# Verify that session_manager isn't configured to pass additional
# environment variables or command-line arguments to Chrome.
local config_path="$rootfs/etc/chrome_dev.conf"
- local matches=$(grep "^[^#]" "${config_path}")
+ local matches=$(grep -s "^[^#]" "${config_path}")
if [ -n "$matches" ]; then
echo "FAIL: Found commands in $config_path:"
echo "$matches"