diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a68939c..726d0cfd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fixed a regression in SELinux support by restoring the `/run` mount during wwinit. #1910 - Fixed `wwctl profile set` for disks, partitions and file systems. #1883 - Do not let API add a node that exists +- Fixed sleep/rebooting on error during GRUB boot. #1894 ### Changed diff --git a/etc/grub/grub.cfg.ww b/etc/grub/grub.cfg.ww index 5bdf0d71..0d39cba2 100644 --- a/etc/grub/grub.cfg.ww +++ b/etc/grub/grub.cfg.ww @@ -58,6 +58,8 @@ menuentry "Single-stage boot" --id single-stage { echo "!! Unable to load kernel." echo "!! Rebooting in 15s..." echo "!!" + sleep 15 + reboot fi echo "Downloading images..." @@ -71,6 +73,8 @@ menuentry "Single-stage boot" --id single-stage { echo "!! Unable to load images." echo "!! Rebooting in 15s..." echo "!!" + sleep 15 + reboot fi echo "Booting..." @@ -101,6 +105,8 @@ menuentry "Single-stage boot (no compression)" --id single-stage-nocompress { echo "!! Unable to load kernel." echo "!! Rebooting in 15s..." echo "!!" + sleep 15 + reboot fi echo "Downloading images..." @@ -153,6 +159,8 @@ menuentry "Two stage boot with dracut" --id dracut { echo "!! Unable to load kernel." echo "!! Rebooting in 15s..." echo "!!" + sleep 15 + reboot fi echo "Downloading initramfs..." @@ -163,6 +171,8 @@ menuentry "Two stage boot with dracut" --id dracut { echo "!! Unable to load initramfs." echo "!! Rebooting in 15s..." echo "!!" + sleep 15 + reboot fi echo "Booting..."