From 4228c591a84c2681e05b61c0eb9b7a4c56cc8ea7 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Wed, 27 Aug 2014 11:51:02 -0700
Subject: [PATCH] disk_layout: mount ESP to /boot instead of /boot/efi

We have long since stopped installing anything to the /boot directory of
the root filesystem. Mount the ESP partition to /boot for consistancy
with the discoverable partition spec.
---
 build_library/build_image_util.sh | 4 ++--
 build_library/disk_layout.json    | 2 +-
 build_library/vm_image_util.sh    | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh
index 6d4f09376f..85d4076843 100755
--- a/build_library/build_image_util.sh
+++ b/build_library/build_image_util.sh
@@ -202,12 +202,12 @@ finish_image() {
       ${tmp_ignore} "${root_fs_dir}/etc"
 
   # Only configure bootloaders if there is a boot partition
-  if mountpoint -q "${root_fs_dir}"/boot/efi; then
+  if mountpoint -q "${root_fs_dir}"/boot; then
     ${BUILD_LIBRARY_DIR}/configure_bootloaders.sh \
       --arch=${ARCH} \
       --disk_layout="${disk_layout}" \
       --boot_dir="${root_fs_dir}"/usr/boot \
-      --esp_dir="${root_fs_dir}"/boot/efi \
+      --esp_dir="${root_fs_dir}"/boot \
       --boot_args="${FLAGS_boot_args}"
   fi
 
diff --git a/build_library/disk_layout.json b/build_library/disk_layout.json
index c30e9619a8..1649b3ae30 100644
--- a/build_library/disk_layout.json
+++ b/build_library/disk_layout.json
@@ -12,7 +12,7 @@
         "type":"efi",
         "blocks":"262144",
         "fs_type":"vfat",
-        "mount":"/boot/efi",
+        "mount":"/boot",
         "features": ["syslinux"]
       },
       "2":{
diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index d343bd87ce..f443440f36 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -276,7 +276,7 @@ setup_disk_image() {
     "${BUILD_LIBRARY_DIR}/disk_util" --disk_layout="${disk_layout}" \
         mount "${VM_TMP_IMG}" "${VM_TMP_ROOT}"
 
-    local SYSLINUX_DIR="${VM_TMP_ROOT}/boot/efi/syslinux"
+    local SYSLINUX_DIR="${VM_TMP_ROOT}/boot/syslinux"
     if [[ $(_get_vm_opt BOOT_KERNEL) -eq 0 ]]; then
         sudo mv "${SYSLINUX_DIR}/default.cfg.A" "${SYSLINUX_DIR}/default.cfg"
     fi
@@ -336,9 +336,9 @@ _run_onmetal_fs_hook() {
     local arg='8250.nr_uarts=5 console=ttyS4,115200n8 modprobe.blacklist=mei_me'
     local timeout=150  # 15 seconds
     local totaltimeout=3000  # 5 minutes
-    sudo sed -i "${VM_TMP_ROOT}/boot/efi/syslinux/boot_kernel.cfg" \
+    sudo sed -i "${VM_TMP_ROOT}/boot/syslinux/boot_kernel.cfg" \
         -e 's/console=[^ ]*//g' -e "s/\\(append.*$\\)/\\1 ${arg}/"
-    sudo sed -i "${VM_TMP_ROOT}/boot/efi/syslinux/syslinux.cfg" \
+    sudo sed -i "${VM_TMP_ROOT}/boot/syslinux/syslinux.cfg" \
         -e "s/^TIMEOUT [0-9]*/TIMEOUT ${timeout}/g" \
         -e "s/^TOTALTIMEOUT [0-9]*/TOTALTIMEOUT ${totaltimeout}/g"
 }
@@ -346,7 +346,7 @@ _run_onmetal_fs_hook() {
 _run_gce_fs_hook() {
     # HACKITY HACK until OEMs can customize bootloader configs
     local arg='console=ttyS0,115200n8'
-    sudo sed -i "${VM_TMP_ROOT}/boot/efi/syslinux/boot_kernel.cfg" \
+    sudo sed -i "${VM_TMP_ROOT}/boot/syslinux/boot_kernel.cfg" \
         -e 's/console=[^ ]*//g' -e "s/\\(append.*$\\)/\\1 ${arg}/"
 }