Merge remote-tracking branch 'stevee/axel-log-fix' into axel-fixperms

[people/teissler/ipfire-2.x.git] / config / syslinux / syslinux.cfg

diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg
index 361a3168e81086da1baa8c956120cd82cf9f2bb8..5a6a975a205c6df275a36ddbfbb9ac522d9af80e 100644 (file)
--- a/config/syslinux/syslinux.cfg
+++ b/config/syslinux/syslinux.cfg
@@ -1,19 +1,17 @@
 TIMEOUT 5000
 DISPLAY boot.msg
 PROMPT 1
-F1 boot.msg
-F2 options.msg
-DEFAULT vmlinuz 
-  APPEND ide=nodma initrd=instroot vga=791 splash=silent ro
-LABEL novga
-  KERNEL vmlinuz
-  APPEND ide=nodma initrd=instroot ro
-LABEL dma
+DEFAULT vmlinuz
+  APPEND initrd=instroot vga=791 splash=silent ro
+LABEL ipfire
   KERNEL vmlinuz
   APPEND initrd=instroot vga=791 splash=silent ro
+LABEL novga
+  KERNEL vmlinuz
+  APPEND initrd=instroot ro
 LABEL unattended
   KERNEL vmlinuz
-  APPEND ide=nodma initrd=instroot vga=791 splash=silent unattended ro
+  APPEND initrd=instroot vga=791 splash=silent unattended ro
 LABEL memtest
   KERNEL memtest
   APPEND -