X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2Fboot%2Fgrub%2Fgrub.cfg;h=d290dd8b8350a42dcde551712204892faf6b9576;hp=39dcdca2ef226e1c186688655402a81a4470fec3;hb=b81f460b30123f3abc8a5e73a5fcf5b5bc10975d;hpb=8dbae90c55e3bd863e4cf64edc267ea398ecb7e6

diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index 39dcdca..d290dd8 100644
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -4,17 +4,14 @@ set timeout=20
 
 if loadfont /boot/grub/ascii.pf2 ; then
    insmod png
-   set gfxmode=1920x1200,1920x1080,1600x900,1440x1050,1440x900,1024x768,auto
+   set gfxmode=auto
    insmod gfxterm
    insmod vbe
    terminal_output gfxterm
 fi
 
-if 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
+if [ -f /boot/grub/grml-theme/theme.txt ] ; then
+  set theme=/boot/grub/grml-theme/theme.txt
 else
   set menu_color_normal=white/black
   set menu_color_highlight=black/yellow
@@ -24,120 +21,11 @@ if [ ${iso_path} ] ; then
     set loopback="findiso=${iso_path}"
 fi
 
-menuentry "%GRML_NAME% - release %VERSION% (default)" {
-    set gfxpayload=keep
-    linux   /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% "${loopback}" "${kernelopts}" nomce 
-    initrd  /boot/%SHORT_NAME%/initrd.gz
-}
-
-menuentry "Memory test (memtest86+)" {
-    linux16 /boot/addons/memtest
-}
-
-menuentry "iPXE - boot via network/PXE" {
-    linux16 /boot/addons/ipxe.lkrn
-}
-
-menuentry "GRUB - all in one image" {
-    linux16  /boot/addons/memdisk
-    initrd16 /boot/addons/allinone.img
-}
-
-menuentry "FreeDOS" {
-    linux16  /boot/addons/memdisk
-    initrd16 /boot/addons/balder10.imz
-}
-
-if [ ${iso_path} ] ; then
-    # assume loopback.cfg boot
-    menuentry "MirOS bsd4grml (via loopback)" {
-        multiboot   /boot/addons/bsd4grml/ldbsd.com
-        module      /boot/addons/bsd4grml/bsd.rd bsd
-        module      /boot/addons/bsd4grml/loopback.0 boot.cfg
-        module      /boot/addons/bsd4grml/loopback.1 boot.1
-        module      /boot/addons/bsd4grml/loopback.2 boot.2
-        module      /boot/addons/bsd4grml/loopback.3 boot.3
-        module      /boot/addons/bsd4grml/loopback.4 boot.4
-        module      /boot/addons/bsd4grml/loopback.5 boot.5
-        module      /boot/addons/bsd4grml/loopback.6 boot.6
-    }
-else
-    # assume grub.cfg boot
-    menuentry "MirOS bsd4grml (regular method)" {
-        multiboot   /boot/addons/bsd4grml/ldbsd.com
-    }
-
-    menuentry "MirOS bsd4grml (fallback method)" {
-        multiboot   /boot/addons/bsd4grml/ldbsd.com
-        module      /boot/addons/bsd4grml/bsd.rd bsd.rd
-        module      /boot/addons/bsd4grml/boot.1 boot.1
-        module      /boot/addons/bsd4grml/boot.2 boot.2
-        module      /boot/addons/bsd4grml/boot.3 boot.3
-        module      /boot/addons/bsd4grml/boot.4 boot.4
-        module      /boot/addons/bsd4grml/boot.5 boot.5
-        module      /boot/addons/bsd4grml/boot.6 boot.6
-        module      /boot/addons/bsd4grml/boot.cfg boot.cfg
-        module      /boot/grub/core.img core.img
-    }
-fi
-
-menuentry "Boot OS of first partition on first disk" {
-    set root=(hd0,1)
-    chainloader +1
-}
-
-menuentry "%GRML_NAME% - enable persistent mode" {
-    set gfxpayload=keep
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" persistent=nofiles 
-    initrd /boot/%SHORT_NAME%/initrd.gz
-}
-
-menuentry "%GRML_NAME% - copy Grml to RAM" {
-    set gfxpayload=keep
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" toram=%GRML_NAME%.squashfs 
-    initrd /boot/%SHORT_NAME%/initrd.gz
-}
-
-menuentry "%GRML_NAME% - copy whole medium to RAM" {
-    set gfxpayload=keep
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" toram 
-    initrd /boot/%SHORT_NAME%/initrd.gz
-}
-
-menuentry "%GRML_NAME% - start X by default" {
-    set gfxpayload=keep
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" startx
-    initrd /boot/%SHORT_NAME%/initrd.gz
-}
-
-menuentry "%GRML_NAME% - disable framebuffer" {
-    set gfxpayload=text
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" video=ofonly  radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset 
-    initrd /boot/%SHORT_NAME%/initrd.gz
-}
-
-menuentry "%GRML_NAME% - disable Kernel Mode-Setting" {
-    set gfxpayload=keep
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset 
-    initrd /boot/%SHORT_NAME%/initrd.gz
-}
-
-menuentry "%GRML_NAME% - forensic mode" {
-    set gfxpayload=keep
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" readonly nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect 
-    initrd /boot/%SHORT_NAME%/initrd.gz
-}
-
-menuentry "%GRML_NAME% - debug mode" {
-    set gfxpayload=keep
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" initcall verbose debug=vc 
-    initrd /boot/%SHORT_NAME%/initrd.gz
-}
+insmod regexp
 
-menuentry "%GRML_NAME% - serial mode" {
-    set gfxpayload=text
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" video=vesafb:off console=tty1 console=ttyS0,9600n8 
-    initrd /boot/%SHORT_NAME%/initrd.gz
-}
+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
 
+source /boot/grub/footer.cfg
 # EOF