From 58bac50d916160538777f0abfb7f97b336f43685 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Fri, 4 Apr 2014 16:58:43 -0700
Subject: [PATCH] fix(vm_image_util): Remove fstab from PXE initrd

Using fstab made overriding it with kernel command line options like
root=/some/disk not work properly. A generator handles it now.
---
 build_library/vm_image_util.sh | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index dc1d174c72..304252b479 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -316,22 +316,9 @@ _write_cpio_common() {
         # packed into the squashfs image. Just ROOT.
         sudo umount --all-targets "${VM_TMP_ROOT}/media/state"
 
-        # Set squashfs as the default root filesystem
-        sudo_clobber "${cpio_target}/etc/fstab" <<EOF
-${squashfs} /sysroot squashfs x-initrd.mount 0 0
-tmpfs /sysroot/usr/share/oem tmpfs size=0,mode=755,x-initrd.mount 0 0
-EOF
-
         # Inject /usr/.noupdate into squashfs to disable update_engine
         echo "/usr/.noupdate f 444 root root echo -n" >"${VM_TMP_DIR}/extra"
     else
-        # Set tmpfs as default root, squashfs as default /usr
-        sudo_clobber "${cpio_target}/etc/fstab" <<EOF
-tmpfs /sysroot tmpfs mode=755,x-initrd.mount 0 0
-${squashfs} /sysroot/usr squashfs x-initrd.mount 0 0
-tmpfs /sysroot/usr/share/oem tmpfs size=0,mode=755,x-initrd.mount 0 0
-EOF
-
         # Use OEM cloud-config to setup the core user's password
         if [[ -s /etc/shared_user_passwd.txt ]]; then
             sudo mkdir -p "${cpio_target}/usr/share/oem"