diff options
| author | Mike Frysinger <vapier@chromium.org> | 2017-05-07 01:34:38 -0400 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-05-11 01:58:53 -0700 |
| commit | f68d76c1cde3a9acb3693e93d25b4c98c4bd1f20 (patch) | |
| tree | 721455ae49142905e9b3e416dfa59e7783c9d1fa | |
| parent | 0dfff398fc9df72af2ebdd205b5722e397e575b4 (diff) | |
| download | vboot-f68d76c1cde3a9acb3693e93d25b4c98c4bd1f20.tar.gz | |
image_signing: do not fail when chronos does not exist
If the device doesn't create a chronos user, don't throw errors.
For some embedded systems, they don't need a chronos user.
BRANCH=None
BUG=chromium:714598
TEST=signing images still works
Change-Id: I4604beae1e647e024a04583471b8a7d0d4f188fa
Reviewed-on: https://chromium-review.googlesource.com/500027
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: David Riley <davidriley@chromium.org>
| -rw-r--r-- | scripts/image_signing/common_minimal.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/image_signing/common_minimal.sh b/scripts/image_signing/common_minimal.sh index a591ae47..f50a3c0a 100644 --- a/scripts/image_signing/common_minimal.sh +++ b/scripts/image_signing/common_minimal.sh @@ -365,7 +365,10 @@ ensure_files_exist() { # Args: rootfs no_chronos_password() { local rootfs=$1 - sudo grep -q '^chronos:\*:' "$rootfs/etc/shadow" + # Make sure the chronos user actually exists. + if grep -qs '^chronos:' "${rootfs}/etc/passwd"; then + sudo grep -q '^chronos:\*:' "${rootfs}/etc/shadow" + fi } trap "cleanup_temps_and_mounts" EXIT |