netboot: Allow booting multiple architectures

[people/shoehn/ipfire.org.git] / templates / netboot / menu-config.cfg

diff --git a/templates/netboot/menu-config.cfg b/templates/netboot/menu-config.cfg
index 0f8450c41471667effd9de1bbbacd39c55f6a148..f064424de6737dfd62c5af100b1bf3b8590e5459 100644 (file)
--- a/templates/netboot/menu-config.cfg
+++ b/templates/netboot/menu-config.cfg
@@ -8,9 +8,9 @@ menu begin {{ release.sname }}
 {{ _("Install %s...") % release.name }}
                endtext
 
-               kernel {{ release.netboot_kernel }}
-               initrd {{ release.netboot_initrd }}
-               append vga=791
+               kernel {{ release.netboot_kernel_url(arch, platform) }}
+               initrd {{ release.netboot_initrd_url(arch, platform) }}
+               append {{ release.netboot_args(arch, platform) }} vga=791
 
        {% module NetBootMenuSeparator() %}
 
@@ -21,8 +21,9 @@ menu begin {{ release.sname }}
 {{ _("Install in text mode.") }}
                endtext
 
-               kernel {{ release.netboot_kernel }}
-               initrd {{ release.netboot_initrd }}
+               kernel {{ release.netboot_kernel_url(arch, platform) }}
+               initrd {{ release.netboot_initrd_url(arch, platform) }}
+               {% if release.netboot_args(arch, platform) %}append {{ release.netboot_args(arch, platform) }}{% end %}
 
 {% if release.id >= 75 %}
        label {{ release.sname }}.scon
@@ -32,9 +33,9 @@ menu begin {{ release.sname }}
 {{ _("Install with serial console.") }}
                endtext
 
-               kernel {{ release.netboot_kernel }}
-               initrd {{ release.netboot_initrd }}
-               append console=ttyS0,115200 novga
+               kernel {{ release.netboot_kernel_url(arch, platform) }}
+               initrd {{ release.netboot_initrd_url(arch, platform) }}
+               append {{ release.netboot_args(arch, platform) }} console=ttyS0,115200 novga
 {% end %}
 
        {% module NetBootMenuSeparator() %}
@@ -43,3 +44,4 @@ menu begin {{ release.sname }}
                menu label {{ _("Back...") }}
                menu exit
 menu end
+{% comment new line %}