fix(pvgrub): Stick root's copy of the configs in /boot/grub

Previously this was in /boot/grub/grub which was probably by mistake.
This commit is contained in:
Michael Marineau 2013-11-19 21:40:40 -08:00
parent 23b1b01f1a
commit 8af32ad6c8
2 changed files with 3 additions and 3 deletions

View File

@ -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

View File

@ -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.