Don't use addons in GRUB if NO_ADDONS is set

[grml-live.git] / templates / boot / grub / grub.cfg

diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index ab2f64c..bdcea7f 100644 (file)
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -1,35 +1,13 @@
 ## grub2 configuration
-set default=0
-set timeout=20
-
-if loadfont /boot/grub/ascii.pf2 ; then
-   insmod png
-   set gfxmode=auto
-   insmod gfxterm
-   insmod vbe
-   terminal_output gfxterm
-fi
-
-if [ -f /boot/grub/grml-theme/theme.txt ] ; then
-  set theme=/boot/grub/grml-theme/theme.txt
-elif background_image /boot/grub/grml.png ; then
-  set color_normal=white/black
-  set color_highlight=red/black
-  set menu_color_normal=white/black
-  set menu_color_highlight=black/yellow
-else
-  set menu_color_normal=white/black
-  set menu_color_highlight=black/yellow
-fi
-
-if [ ${iso_path} ] ; then
-    set loopback="findiso=${iso_path}"
-fi
+source /boot/grub/header.cfg
 
+insmod regexp
 
 for config in /boot/grub/*_default.cfg ; do source "$config" ; done
 for config in /boot/grub/*_options.cfg ; do source "$config" ; done
-source /boot/grub/addons.cfg
+if [ -f /boot/grub/addons.cfg ] ; then
+  source "/boot/grub/addons.cfg"
+fi
 
 source /boot/grub/footer.cfg
 # EOF