termina: only create vm_tools.img if cros-containers dir exists
BUG=chromium:1018185
TEST=termina_build_image on sludge
Change-Id: Ied2a68aebd59c84cda3094df80ee0603e952e038
Reviewed-on: https://chromium-review.googlesource.com/1880984
Tested-by: kokoro <noreply+kokoro@google.com>
Tested-by: Victor-Gabriel Savu <vsavu@google.com>
Tested-by: Stephen Barber <smbarber@chromium.org>
Commit-Ready: Stephen Barber <smbarber@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Victor-Gabriel Savu <vsavu@google.com>
diff --git a/termina/termina_build_image.py b/termina/termina_build_image.py
index 78a66f3..e67f2f4 100755
--- a/termina/termina_build_image.py
+++ b/termina/termina_build_image.py
@@ -162,15 +162,16 @@
dedupe_hardlinks(rootfs_dir)
- # Create vm_tools.img.
+ # Create vm_tools.img if /opt/google/cros-containers exists.
tools_dir = rootfs_dir / 'opt' / 'google' / 'cros-containers'
- create_fs_image(output_dir / 'vm_tools.img', tools_dir)
+ if tools_dir.exists():
+ create_fs_image(output_dir / 'vm_tools.img', tools_dir)
- # Remove contents of tools_dir so they are not included in vm_rootfs.img.
- # Leave the top-level /opt/google/cros-containers directory in place
- # as a mount point.
- for child in tools_dir.iterdir():
- shutil.rmtree(child)
+ # Remove contents of tools_dir so they are not included in vm_rootfs.img.
+ # Leave the top-level /opt/google/cros-containers directory in place
+ # as a mount point.
+ for child in tools_dir.iterdir():
+ shutil.rmtree(child)
# Create vm_rootfs.img.
create_fs_image(output_dir / 'vm_rootfs.img', rootfs_dir)
