diff options
| author | George Engelbrecht <engeg@google.com> | 2020-10-30 16:18:04 -0600 |
|---|---|---|
| committer | George Engelbrecht <engeg@google.com> | 2020-10-30 22:36:02 +0000 |
| commit | d621e58a53c72b64aea88df19fd29560d635e956 (patch) | |
| tree | e82c9570fdb4565010ba9eedf0a0201ede56690c | |
| parent | 3c644e07368c8827c1de1c8d919c48dac1153c6a (diff) | |
| download | vboot-d621e58a53c72b64aea88df19fd29560d635e956.tar.gz | |
sign_android: don't use xattrs from unsquashfs
We've moved to applying a file based set of selinux policies instead of
taking the ones that were snagged from the image. Remove the policy
attributes and let unsquash do whatever it would do by default.
See https://chat.google.com/room/AAAA45hbdCQ/jkXYe7jMEDk.
BUG=chromium:1141907
TEST=unittests
Change-Id: I0a976fb216e0a07c00c4bb2fb68df6fa1ea00d79
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2511121
Reviewed-by: Yury Khmel <khmel@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Yury Khmel <khmel@google.com>
Commit-Queue: George Engelbrecht <engeg@google.com>
Commit-Queue: Yury Khmel <khmel@google.com>
Tested-by: George Engelbrecht <engeg@google.com>
Auto-Submit: George Engelbrecht <engeg@google.com>
| -rwxr-xr-x | scripts/image_signing/sign_android_image.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/image_signing/sign_android_image.sh b/scripts/image_signing/sign_android_image.sh index 28534fca..bd107899 100755 --- a/scripts/image_signing/sign_android_image.sh +++ b/scripts/image_signing/sign_android_image.sh @@ -231,7 +231,7 @@ replace_ota_cert() { # Snapshot file properties in a directory recursively. snapshot_file_properties() { local dir=$1 - sudo find "${dir}" -exec stat -c '%n:%u:%g:%a:%C' {} + | sort + sudo find "${dir}" -exec stat -c '%n:%u:%g:%a' {} + | sort } main() { @@ -289,7 +289,7 @@ main() { local system_mnt="${working_dir}/mnt" info "Unpacking squashfs system image to ${system_mnt}" - sudo "${unsquashfs}" -x -f -no-progress -d "${system_mnt}" "${system_img}" + sudo "${unsquashfs}" -no-xattrs -f -no-progress -d "${system_mnt}" "${system_img}" snapshot_file_properties "${system_mnt}" > "${working_dir}/properties.orig" |