commit 216f2f5fb1f8e4c3003afabf746486b5c1dad589
author Fergus Dall <sidereal@google.com> Mon May 10 17:24:27 2021 +1000
committer Commit Bot <commit-bot@chromium.org> Tue May 11 01:12:53 2021 +0000
tree 390757cfd083b074cf490b54456f232afafa85b1
parent 4669dde01970d897fff2c4e2b7a1cfa00d6e6954

termina_build_image: Call unsquashfs with -no-xattrs

The newest version of squashfs-tools considers failing to write
xattrs (say, because you are not root) a fatal error. Since this never
worked before, it's probably fine to just turn that off.

BUG=b:186436472
TEST=manually tested

Change-Id: I791c6d17790da5f43195ac90711295860b14cbc5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/containers/cros-container-guest-tools/+/2881526
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Fergus Dall <sidereal@google.com>
Reviewed-by: David Munro <davidmunro@google.com>
Reviewed-by: Nicholas Verne <nverne@chromium.org>

termina/termina_build_image.py

diff --git a/termina/termina_build_image.py b/termina/termina_build_image.py
index ba2f15a..0975dd5 100755
--- a/termina/termina_build_image.py
+++ b/termina/termina_build_image.py
@@ -127,9 +127,9 @@
 
     # Unsquash the rootfs and stateful partitions.
     rootfs_dir = tempdir / 'rootfs'
-    subprocess.run(['unsquashfs', '-d', str(rootfs_dir), str(rootfs_img_path)], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
+    subprocess.run(['unsquashfs', '-no-xattrs', '-d', str(rootfs_dir), str(rootfs_img_path)], stdout=subprocess.DEVNULL, check=True)
     stateful_dir = tempdir / 'stateful'
-    subprocess.run(['unsquashfs', '-d', str(stateful_dir), str(stateful_img_path)], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
+    subprocess.run(['unsquashfs', '-no-xattrs', '-d', str(stateful_dir), str(stateful_img_path)], stdout=subprocess.DEVNULL, check=True)
 
     # Extract the kernel. For ARM we just grab the Image-* file. For x86, we
     # grab the vmlinuz (bzImage).