boot: Support serial console installations.

diff --git a/templates/netboot/menu-config.cfg b/templates/netboot/menu-config.cfg
index 200bae1eb7c4b3af4cdb97ab599172ab14eea7b1..0f8450c41471667effd9de1bbbacd39c55f6a148 100644 (file)
--- 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 c3b42d921584c62b5486b4c21d0eb0b50e96f6ac..ff482c0221fe4e347ba660ec41834d2fb9d52a9e 100644 (file)
--- 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):