From c8d986d408ef6039adc287b38bffcb1c2f30d935 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Thu, 5 Sep 2013 16:17:14 -0400
Subject: [PATCH 1/2] fix(image_to_vm): Cleanup must run as root.

Failures mid-build leave root-owned files behind.
---
 build_library/vm_image_util.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index 563f29727b..578fb32e30 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -698,7 +698,7 @@ EOF
 
 vm_cleanup() {
     info "Cleaning up temporary files"
-    rm -rf "${VM_TMP_DIR}"
+    sudo rm -rf "${VM_TMP_DIR}"
 }
 
 print_readme() {

From bbacf2f0bd527a247d9eac7d302c31dd78626834 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Thu, 5 Sep 2013 16:24:45 -0400
Subject: [PATCH 2/2] fix(image_to_vm): Mount source rootfs as ro when creating
 cpio.

When building with a write-protected root mounting as rw, the default,
fails.
---
 build_library/vm_image_util.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index 578fb32e30..b2f1500819 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -372,7 +372,7 @@ _write_base_cpio_disk() {
     mkdir -p "${root_mnt}"
 
     # Roll the rootfs into the CPIO
-    sudo mount -o loop "${TEMP_ROOTFS}" "${root_mnt}"
+    sudo mount -o loop,ro "${TEMP_ROOTFS}" "${root_mnt}"
     _write_dir_to_cpio "${root_mnt}" "$2"
     cp "${root_mnt}"/boot/vmlinuz "${dst_dir}/${vmlinuz_name}"
     sudo umount "${root_mnt}"