Update grub

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>

diff --git a/generate_image.sh b/generate_image.sh
index 3d583f098de14ff53142c24fde8372517fbb259b..5f15d073253a2b977f7e6945a4803ae0c46ffc54 100755 (executable)
--- a/generate_image.sh
+++ b/generate_image.sh
@@ -460,13 +460,6 @@ yes | pakfire --root=${IMAGE_MOUNT_DIR} ${ENABLE_LOCAL} install @Base ${PACKAGES
 
 cmd cp -f "${SCRIPT_PATH}/grub" "${IMAGE_MOUNT_DIR}/etc/default"
 
-#
-## Install grub2 if neccessary
-#
-if [ "${HAVE_GRUB}" == "True" ]; then
-       grub2-install --boot-directory=${IMAGE_MOUNT_DIR}/boot/ --modules="${FILESYSTEM} part_msdos" ${outlo}
-fi
-
 #
 ## Generate fstab
 #
@@ -504,9 +497,11 @@ ENABLE_GETTY="/bin/systemctl enable getty@.service"
 
 # Check if the arch uses grub
 if [ "${HAVE_GRUB}" == "True" ]; then
-       GENERATE_GRUB_CONF="grub-mkconfig -o /boot/grub2/grub.cfg"
+       GENERATE_GRUB_CONF="grub-install --boot-directory=${IMAGE_MOUNT_DIR}/boot/ --modules="${FILESYSTEM} part_msdos" ${outlo} && \
+       grub-mkconfig -o /boot/grub/grub.cfg"
 fi
 
+
 # Use systemd-nspawn to spawn a chroot environment and execute
 # commands inside it.
 #
@@ -528,10 +523,10 @@ END
 # Insert the UUID because grub-mkconfig often fails to
 # detect that correctly
 
-sed -i "${IMAGE_MOUNT_DIR}/boot/grub2/grub.cfg" \
+sed -i "${IMAGE_MOUNT_DIR}/boot/grub/grub.cfg" \
                -e "s/root=[A-Za-z0-9\/=-]*/root=UUID=${FS_UUID}/g"
 
-cat "${IMAGE_MOUNT_DIR}/boot/grub2/grub.cfg"
+cat "${IMAGE_MOUNT_DIR}/boot/grub/grub.cfg"
 
 cat  "${IMAGE_MOUNT_DIR}/etc/fstab"