Merge remote-tracking branch 'origin/next' into thirteen

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

diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg
index 7d5d3319464b35dcbdbd52b85fe289e3600b46fb..ee258cc37c6bde85160ea3b9bf6a0d7e752002b9 100644 (file)
--- a/config/syslinux/syslinux.cfg
+++ b/config/syslinux/syslinux.cfg
@@ -1,19 +1,14 @@
 TIMEOUT 5000
 DISPLAY boot.msg
 PROMPT 1
-F1 boot.msg
-F2 options.msg
-DEFAULT vmlinuz 
-  APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent ro
-LABEL unattended 
-  KERNEL vmlinuz
-  APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 ro unattended
+DEFAULT vmlinuz
+  APPEND initrd=instroot vga=791 quiet rhgb ro
 LABEL novga
   KERNEL vmlinuz
-  APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 ro
-LABEL dma
+  APPEND initrd=instroot quiet rhgb ro
+LABEL unattended
   KERNEL vmlinuz
-  APPEND initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent ro
+  APPEND initrd=instroot vga=791 quiet rhgb  unattended ro
 LABEL memtest
   KERNEL memtest
   APPEND -