diff options
| author | Mike Frysinger <vapier@chromium.org> | 2014-10-06 01:18:51 -0400 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-10-09 03:31:49 +0000 |
| commit | 4b0110b9a65024c7ccb40b771b3c9271fdef7b4c (patch) | |
| tree | a5d5f3b4ea91e62d9e5458ec6c52c689a7a57b36 | |
| parent | bfd503694e278557900417232a98deb3a83d07e7 (diff) | |
| download | vboot-4b0110b9a65024c7ccb40b771b3c9271fdef7b4c.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
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>
(cherry picked from commit 2b802de836e90ae65f3ea4ef391b6df2fc28aba3)
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Change-Id: Ibac0978e3e4d9f89c00206a2dd21c1d71544f710
Reviewed-on: https://chromium-review.googlesource.com/222261
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Tested-by: Duncan Laurie <dlaurie@chromium.org>
Commit-Queue: Duncan Laurie <dlaurie@chromium.org>
| -rwxr-xr-x | scripts/image_signing/ensure_no_nonrelease_files.sh | 2 |
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" |