From 0dc3cde8dc0efdb8c301a3ea431cf16c621a7185 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 8 Jul 2014 13:07:31 +0200
Subject: [PATCH] boot: Support serial console installations.

---
 templates/netboot/menu-config.cfg | 48 ++++++++++++++++++++++++++-----
 webapp/backend/releases.py        |  4 ---
 2 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/templates/netboot/menu-config.cfg b/templates/netboot/menu-config.cfg
index 200bae1e..0f8450c4 100644
--- a/templates/netboot/menu-config.cfg
+++ b/templates/netboot/menu-config.cfg
@@ -1,11 +1,45 @@
-label {{ release.sname }}
-	menu label {{ release.name }}
+menu begin {{ release.sname }}
+	menu title {{ release.name }}
 
-	text help
+	label {{ release.sname }}.default
+		menu label Start installation!
+
+		text help
 {{ _("Install %s...") % release.name }}
-	endtext
+		endtext
+
+		kernel {{ release.netboot_kernel }}
+		initrd {{ release.netboot_initrd }}
+		append vga=791
+
+	{% module NetBootMenuSeparator() %}
+
+	label {{ release.sname }}.novga
+		menu label {{ _("Install in text mode") }}
+
+		text help
+{{ _("Install in text mode.") }}
+		endtext
+
+		kernel {{ release.netboot_kernel }}
+		initrd {{ release.netboot_initrd }}
+
+{% if release.id >= 75 %}
+	label {{ release.sname }}.scon
+		menu label {{ _("Install with serial console") }}
+
+		text help
+{{ _("Install with serial console.") }}
+		endtext
+
+		kernel {{ release.netboot_kernel }}
+		initrd {{ release.netboot_initrd }}
+		append console=ttyS0,115200 novga
+{% end %}
 
-	kernel {{ release.netboot_kernel }}
-	initrd {{ release.netboot_initrd }}
-	append {{ release.netboot_append }}
+	{% module NetBootMenuSeparator() %}
 
+	label {{ release.sname }}.back
+		menu label {{ _("Back...") }}
+		menu exit
+menu end
diff --git a/webapp/backend/releases.py b/webapp/backend/releases.py
index c3b42d92..ff482c02 100644
--- a/webapp/backend/releases.py
+++ b/webapp/backend/releases.py
@@ -376,10 +376,6 @@ class Release(Object):
 	def netboot_initrd(self):
 		return "http://downloads.ipfire.org/%s/images/instroot" % self.path
 
-	@property
-	def netboot_append(self):
-		return "ro"
-
 
 class Releases(Object):
 	def get_by_id(self, id):
-- 
2.47.3