merge branches

[grml-terminalserver.git] / templates / grub-pxelinux_config

diff --git a/templates/grub-pxelinux_config b/templates/grub-pxelinux_config
index e87b371..3ecd48b 100644 (file)
--- a/templates/grub-pxelinux_config
+++ b/templates/grub-pxelinux_config
@@ -1,5 +1,3 @@
-#!/bin/sh i like colors :)
-#
 # the following variables are available in the template:
 #
 # $INTERFACE_     (interface for the terminalserver)
@@ -32,8 +30,8 @@ grub_def_boot_args_="/linux26 $default_boot_args_"
 pxe_def_boot_args_="$default_boot_args_ initrd=minirt26.gz"
 
 # default arguments for framebuffer console
-def_fb_args_="video=vesafb:ypan,1024x768-16@60"
-no_fb_args_="video=nofb"
+def_fb_args_="vga=791"
+no_fb_args_="vga=normal"
 
 ###
 ## create grub config
@@ -116,7 +114,7 @@ APPEND $pxe_def_boot_args_ debuginit $def_fb_args_ $BOOT_ARGS_
 LABEL debuginit
 KERNEL linux26
 APPEND $pxe_def_boot_args_ debuginit $no_fb_args_ $BOOT_ARGS_
-LABEL resuce
+LABEL rescue
 KERNEL linux26
 APPEND $pxe_def_boot_args_ $no_fb_args_
 LABEL memtest