From 8af32ad6c8b4a83453a5e41b9831960f1dda220b Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Tue, 19 Nov 2013 21:40:40 -0800
Subject: [PATCH] fix(pvgrub): Stick root's copy of the configs in /boot/grub

Previously this was in /boot/grub/grub which was probably by mistake.
---
 build_library/create_legacy_bootloader_templates.sh | 2 +-
 update_bootloaders.sh                               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build_library/create_legacy_bootloader_templates.sh b/build_library/create_legacy_bootloader_templates.sh
index 11902f9dc1..c4dd64a08b 100755
--- a/build_library/create_legacy_bootloader_templates.sh
+++ b/build_library/create_legacy_bootloader_templates.sh
@@ -46,7 +46,7 @@ if [[ "${FLAGS_arch}" = "x86" || "${FLAGS_arch}" = "amd64"  ]]; then
   ROOTB="PARTUUID=$(get_uuid base ROOT-B)"
 
   # Build configuration files for pygrub/pvgrub
-  GRUB_DIR="${FLAGS_to}/boot/grub"
+  GRUB_DIR="${FLAGS_to}/grub"
   sudo mkdir -p "${GRUB_DIR}"
 
   # Add hvc0 for hypervisors
diff --git a/update_bootloaders.sh b/update_bootloaders.sh
index 24b2d6e9d9..184c0335e8 100755
--- a/update_bootloaders.sh
+++ b/update_bootloaders.sh
@@ -101,8 +101,8 @@ if [[ "${FLAGS_arch}" = "x86" || "${FLAGS_arch}" = "amd64" ]]; then
   # Copy over the grub configurations for cloud machines and the
   # kernel into both the A and B slot
   sudo mkdir -p "${ESP_FS_DIR}"/boot/grub
-  sudo cp -r "${FLAGS_from}"/boot/grub/. "${ESP_FS_DIR}"/boot/grub
-  sudo cp -r "${FLAGS_from}"/boot/grub/menu.lst.A "${ESP_FS_DIR}"/boot/grub/menu.lst
+  sudo cp -r "${FLAGS_from}"/grub/. "${ESP_FS_DIR}"/boot/grub
+  sudo cp -r "${FLAGS_from}"/grub/menu.lst.A "${ESP_FS_DIR}"/boot/grub/menu.lst
 
   # Prepopulate the syslinux directories too and update for verified boot values
   # after the rootfs work is done.