commit 0a163aff22c084f6e292a9ef74bb6f6b9a7aff62
author Qijiang Fan <fqj@chromium.org> Mon Jan 21 17:51:18 2019 +0900
committer chrome-bot <chrome-bot@chromium.org> Thu Jan 24 00:51:48 2019 -0800
tree 3704699ff549666339bca259e625e95b7d4ae27c
parent 18e375890b20080de2b1b0604a459ae43450c90a

build_image: restorecon for /usr/local and /mnt/stateful_partition

BUG=b:116072767
TEST=build_images

Change-Id: I428c989f6e2dd38487f59a0bee83c0e20cfbdc1f
Reviewed-on: https://chromium-review.googlesource.com/1423944
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Qijiang Fan <fqj@google.com>
Reviewed-by: Kenny Root <kroot@google.com>

build_library/selinux_util.sh

diff --git a/build_library/selinux_util.sh b/build_library/selinux_util.sh
index 2a0d85c..b2382f8 100644
--- a/build_library/selinux_util.sh
+++ b/build_library/selinux_util.sh
@@ -25,5 +25,9 @@
   # of skipping it.
   sudo umount "${rootfs}/var"
   sudo /sbin/setfiles -m -r "${rootfs}" "${file_contexts}" "${rootfs}"
+  sudo /sbin/setfiles -m -r "${rootfs}" "${file_contexts}" "${rootfs}/usr/local"
+  # use ${rootfs}/mnt/stateful_partition instead of ${stateful} in comply with
+  # -r ${rootfs} options.
+  sudo /sbin/setfiles -m -r "${rootfs}" "${file_contexts}" "${rootfs}/mnt/stateful_partition"
   sudo mount --bind "${stateful}/var_overlay" "${rootfs}/var"
 }