X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=config%2Fsyslinux%2Fsyslinux.cfg;h=cfb8113cf6e57fc4cda28c730bd91f45b044bebe;hp=74d4e3e39966f12e32af98c2ab030f4cb99bdbc7;hb=0e331dd73b89f397f893c51447a5237935459fbb;hpb=df2ac65557ed600db49178475691048755380fe4

diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg
index 74d4e3e399..cfb8113cf6 100644
--- a/config/syslinux/syslinux.cfg
+++ b/config/syslinux/syslinux.cfg
@@ -1,8 +1,9 @@
+SERIAL 0 115200
 
 UI vesamenu.c32
 PROMPT 0
 DEFAULT installer
-TIMEOUT 60
+TIMEOUT 600
 
 MENU HSHIFT 0
 MENU WIDTH  40
@@ -24,6 +25,9 @@ MENU TITLE Welcome!
 
 LABEL installer
 	MENU LABEL Install IPFire VERSION
+	TEXT HELP
+Install the version of IPFire that is on this disk.
+	ENDTEXT
 	KERNEL vmlinuz
 	INITRD instroot
 	APPEND vga=791
@@ -41,14 +45,20 @@ MENU BEGIN other
 
 	LABEL novga
 		MENU LABEL Install IPFire (text mode)
+		TEXT HELP
+Run the installer in text mode.
+		ENDTEXT
 		KERNEL vmlinuz
 		INITRD instroot
 
 	LABEL unattended
 		MENU LABEL Unattended installation
+		TEXT HELP
+Run an unattended installation.
+		ENDTEXT
 		KERNEL vmlinuz
 		INITRD instroot
-		APPEND unattended
+		APPEND installer.unattended
 MENU END
 
 MENU BEGIN tools
@@ -62,9 +72,70 @@ MENU BEGIN tools
 
 	LABEL memtest
 		MENU LABEL memtest86+
+		TEXT HELP
+Diagnose memory problems with memtest86+.
+		ENDTEXT
 		KERNEL memtest
 
 	LABEL hdt
 		MENU LABEL Hardware Detection Tool
+		TEXT HELP
+Check your hardware with the Hardware Detection Tool!
+		ENDTEXT
 		KERNEL hdt.c32
 MENU END
+
+MENU BEGIN serial
+	MENU TITLE Serial console options
+
+	LABEL serial.back
+		MENU LABEL Back
+		MENU EXIT
+
+	MENU SEPARATOR
+
+	LABEL ipfire-serial
+		MENU LABEL Install IPFire (serial)
+		TEXT HELP
+Run the installer with serial console.
+		ENDTEXT
+		KERNEL vmlinuz
+		INITRD instroot
+		APPEND console=ttyS0,115200 novga
+
+	LABEL unattended-serial
+		MENU LABEL Unattended installation (serial)
+		TEXT HELP
+Run an unattended installation wit serial console.
+		ENDTEXT
+		KERNEL vmlinuz
+		INITRD instroot
+		APPEND console=ttyS0,115200 novga unattended
+
+	MENU SEPARATOR
+
+	LABEL memtest-serial
+		MENU LABEL memtest86+ (serial)
+		TEXT HELP
+Diagnose memory problems with memtest86+ with serial console.
+		ENDTEXT
+		KERNEL memtest
+		APPEND console=ttyS0,115200
+
+	LABEL hdt-serial
+		MENU LABEL Hardware Detection Tool
+		TEXT HELP
+Check your hardware with the Hardware Detection Tool!
+		ENDTEXT
+		KERNEL hdt.c32
+
+MENU END
+
+MENU SEPARATOR
+
+LABEL netboot
+	MENU LABEL boot.ipfire.org
+	TEXT HELP
+Boot from the IPFire Boot Server!
+	ENDTEXT
+	KERNEL netboot