From 7c367fb2fa748028dce2af6739aa90c4cc687872 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 24 Jun 2013 21:48:56 +0200 Subject: [PATCH] Provide boot menu entries for upcoming 3.0 stable release --- templates/boot/grub/grub.cfg | 28 +++++++++++++++ templates/boot/isolinux/isolinux.cfg | 51 +++++++++++++++++++++++++++- 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg index 8fa0b20..0471f3d 100644 --- a/templates/boot/grub/grub.cfg +++ b/templates/boot/grub/grub.cfg @@ -91,6 +91,20 @@ menuentry "sip:providerCE (static NW) - pre-release" { initrd /boot/%SHORT_NAME%/initrd.img } +menuentry "sip:providerCE (DHCP) - version 3.0" { + echo 'Loading kernel...' + linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=sipwise debianrelease=squeeze netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpvers=3.0 + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + +menuentry "sip:providerCE (static NW) - version 3.0" { + echo 'Loading kernel...' + linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=sipwise debianrelease=squeeze netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ip=192.168.51.123::192.168.51.1:255.255.255.0:spce:eth0:off dns=92.42.136.30 ngcpvers=3.0 + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + menuentry "sip:providerCE (DHCP) - version 2.8" { echo 'Loading kernel...' linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=sipwise debianrelease=squeeze netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpvers=2.8 @@ -194,6 +208,20 @@ menuentry "sip:providerPRO - sp2 / pre-release" { initrd /boot/%SHORT_NAME%/initrd.img } +menuentry "sip:providerPRO - sp1 / 3.0 release" { + echo 'Loading kernel...' + linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=squeeze netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=92.42.136.30 ngcpvers=3.0 + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + +menuentry "sip:providerPRO - sp2 / 3.0 release" { + echo 'Loading kernel...' + linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=squeeze netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=92.42.136.30 ngcpvers=3.0 + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + menuentry "sip:providerPRO - sp1 / 2.8 release" { echo 'Loading kernel...' linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=squeeze netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=92.42.136.30 ngcpvers=2.8 diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg index fe5dc20..4a0f53e 100644 --- a/templates/boot/isolinux/isolinux.cfg +++ b/templates/boot/isolinux/isolinux.cfg @@ -273,6 +273,30 @@ label cenwpre in boot command line if necessary. endtext +label ce3.0 + menu label sip:providerCE (DHCP) - version 3.0 + kernel /boot/%SHORT_NAME%/vmlinuz + append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=sipwise debianrelease=squeeze netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpvers=3.0 + + text help + Install sip:provider + community edition, version 3.0. + Retrieve network configuration + via DHCP. + endtext + +label cenw3.0 + menu label sip:providerCE (static NW) - version 3.0 + kernel /boot/%SHORT_NAME%/vmlinuz + append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=sipwise debianrelease=squeeze netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ip=192.168.51.123::192.168.51.1:255.255.255.0:spce:eth0:off dns=92.42.136.30 ngcpvers=3.0 + + text help + Install sip:provider + community edition, version 3.0. + Use static IP configuration, adjust + in boot command line if necessary. + endtext + label ce2.8 menu label sip:providerCE (DHCP) - version 2.8 kernel /boot/%SHORT_NAME%/vmlinuz @@ -297,7 +321,6 @@ label cenw2.8 in boot command line if necessary. endtext - label ce2.7 menu label sip:providerCE (DHCP) - version 2.7 kernel /boot/%SHORT_NAME%/vmlinuz @@ -463,6 +486,32 @@ label prosp2nw-pre in boot command line if necessary. endtext +label prosp1nw-3.0 + menu label sip:providerPRO - sp1 / 3.0 release + kernel /boot/%SHORT_NAME%/vmlinuz + append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=squeeze netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=92.42.136.30 ngcpvers=3.0 + + text help + Install sip:provider + professional edition, version 3.0. + Install first node of HA setup. + Use static IP configuration, adjust + in boot command line if necessary. + endtext + +label prosp2nw-3.0 + menu label sip:providerPRO - sp2 / 3.0 release + kernel /boot/%SHORT_NAME%/vmlinuz + append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=squeeze netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=92.42.136.30 ngcpvers=3.0 + + text help + Install sip:provider + professional edition, version 3.0. + Install second node of HA setup. + Use static IP configuration, adjust + in boot command line if necessary. + endtext + label prosp1nw-2.8 menu label sip:providerPRO - sp1 / 2.8 release kernel /boot/%SHORT_NAME%/vmlinuz