From b1cb4a4b6f54e7fcbf01a28d27d4fa4a99a7fac6 Mon Sep 17 00:00:00 2001 From: Andrew Pogrebennyk Date: Mon, 14 Apr 2014 10:33:33 +0200 Subject: [PATCH] MT#5847 Add PRO mr3.2.1 to deployment ISO. --- templates/boot/grub/grub.cfg | 14 ++++++++++++++ templates/boot/isolinux/isolinux.cfg | 26 ++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg index 90b8143..7ea9b39 100644 --- a/templates/boot/grub/grub.cfg +++ b/templates/boot/grub/grub.cfg @@ -236,6 +236,20 @@ menuentry "sip:providerPRO - sp2 / pre-release" { initrd /boot/%SHORT_NAME%/initrd.img } +menuentry "sip:providerPRO - sp1 / mr3.2.1 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=wheezy 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=mr3.2.1 + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + +menuentry "sip:providerPRO - sp2 / mr3.2.1 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=wheezy 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=mr3.2.1 + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + menuentry "sip:providerPRO - sp1 / 3.1 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=wheezy 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.1 diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg index 676b109..91ef96d 100644 --- a/templates/boot/isolinux/isolinux.cfg +++ b/templates/boot/isolinux/isolinux.cfg @@ -534,6 +534,32 @@ label prosp2nw-pre in boot command line if necessary. endtext +label prosp1nw-mr3.2.1 + menu label sip:providerPRO - sp1 / mr3.2.1 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=wheezy 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=mr3.2.1 + + text help + Install sip:provider + professional edition, version mr3.2.1. + Install first node of HA setup. + Use static IP configuration, adjust + in boot command line if necessary. + endtext + +label prosp2nw-mr3.2.1 + menu label sip:providerPRO - sp2 / mr3.2.1 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=wheezy 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=mr3.2.1 + + text help + Install sip:provider + professional edition, version mr3.2.1. + Install second node of HA setup. + Use static IP configuration, adjust + in boot command line if necessary. + endtext + label prosp1nw-3.1 menu label sip:providerPRO - sp1 / 3.1 release kernel /boot/%SHORT_NAME%/vmlinuz