Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

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

diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg
index da7df9194522dbd8c0a49ebd710c3a6d74d527ef..361a3168e81086da1baa8c956120cd82cf9f2bb8 100644 (file)
--- a/config/syslinux/syslinux.cfg
+++ b/config/syslinux/syslinux.cfg
@@ -4,22 +4,16 @@ PROMPT 1
 F1 boot.msg
 F2 options.msg
 DEFAULT vmlinuz 
-APPEND ide=nodma initrd=instroot.gz root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw
-LABEL unattended 
+  APPEND ide=nodma initrd=instroot vga=791 splash=silent ro
+LABEL novga
   KERNEL vmlinuz
-  APPEND ide=nodma initrd=instroot.gz root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw unattended
-LABEL nopcmcia
-  KERNEL vmlinuz
-  APPEND ide=nodma initrd=instroot.gz root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw nopcmcia
-LABEL nousb
-  KERNEL vmlinuz
-  APPEND ide=nodma initrd=instroot.gz root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw nousb
-LABEL nousborpcmcia
-  KERNEL vmlinuz
-  APPEND ide=nodma initrd=instroot.gz root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw nousb nopcmcia
+  APPEND ide=nodma initrd=instroot ro
 LABEL dma
   KERNEL vmlinuz
-  APPEND initrd=instroot.gz root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw
+  APPEND initrd=instroot vga=791 splash=silent ro
+LABEL unattended
+  KERNEL vmlinuz
+  APPEND ide=nodma initrd=instroot vga=791 splash=silent unattended ro
 LABEL memtest
   KERNEL memtest
   APPEND -