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 0592f1160325e4d241210be65506a80bdda0bd76..0aa1ec06da0cf4e943915ba7d12005d03cef31ca 100644 (file)
--- a/config/syslinux/syslinux.cfg
+++ b/config/syslinux/syslinux.cfg
@@ -4,22 +4,13 @@ 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 rw
-LABEL unattended 
+  APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent ro
+LABEL novga
   KERNEL vmlinuz
-  APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw unattended
-LABEL nopcmcia
-  KERNEL vmlinuz
-  APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw nopcmcia
-LABEL nousb
-  KERNEL vmlinuz
-  APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw nousb
-LABEL nousborpcmcia
-  KERNEL vmlinuz
-  APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw nousb nopcmcia
+  APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 ro
 LABEL dma
   KERNEL vmlinuz
-  APPEND initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw
+  APPEND initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent ro
 LABEL memtest
   KERNEL memtest
   APPEND -