diff --git a/grub.cfg_pro b/grub.cfg_pro index f74f7c2..acf5356 100644 --- a/grub.cfg_pro +++ b/grub.cfg_pro @@ -12,3 +12,17 @@ menuentry "sip:providerPRO - sp2 / ##VERSION## release" { initrd /boot/%SHORT_NAME%/initrd.img } +menuentry "sip:providerPRO - sp1 DHCP/ ##VERSION## 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=##DIST## netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ngcpvers=##VERSION## ngcpnw.dhcp + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + +menuentry "sip:providerPRO - sp2 DHCP/ ##VERSION## 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=##DIST## netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ngcpvers=##VERSION## ngcpnw.dhcp + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + diff --git a/isolinux.cfg_pro b/isolinux.cfg_pro index bfd2f17..83dc7a4 100644 --- a/isolinux.cfg_pro +++ b/isolinux.cfg_pro @@ -24,3 +24,27 @@ label prosp2nw-##VERSION## in boot command line if necessary. endtext +label prosp1-##VERSION## + menu label sip:providerPRO - sp1 DHCP/ ##VERSION## 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=##DIST## netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ngcpvers=##VERSION## ngcpnw.dhcp + + text help + Install sip:provider + professional edition, version ##VERSION##. + Install first node of HA setup. + Retrieve network configuration via DHCP. + endtext + +label prosp2-##VERSION## + menu label sip:providerPRO - sp2 DHCP/ ##VERSION## 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=##DIST## netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ngcpvers=##VERSION## ngcpnw.dhcp + + text help + Install sip:provider + professional edition, version ##VERSION##. + Install second node of HA setup. + Retrieve network configuration via DHCP. + endtext + diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg index 811bdb2..6880974 100644 --- a/templates/boot/grub/grub.cfg +++ b/templates/boot/grub/grub.cfg @@ -37,6 +37,20 @@ menuentry "Install sip:providerPRO - sp2" { initrd /boot/%SHORT_NAME%/initrd.img } +menuentry "Install sip:providerPRO - sp1 DHCP" { + 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 ngcpnw.dhcp + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + +menuentry "Install sip:providerPRO - sp2 DHCP" { + 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 ngcpnw.dhcp + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + ## submenus submenu "Install Debian ... ->" --class=submenu { @@ -120,6 +134,20 @@ menuentry "sip:providerPRO - sp2 / trunk release" { initrd /boot/%SHORT_NAME%/initrd.img } +menuentry "sip:providerPRO - sp1 DHCP/ trunk 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 ngcptrunk ngcpnoupload ngcpnw.dhcp + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + +menuentry "sip:providerPRO - sp2 DHCP/ trunk 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 ngcptrunk ngcpnoupload ngcpnw.dhcp + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + source /boot/grub/sipwise_pro.cfg } # Specific sip:providerPRO releases diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg index 6e05e87..bb03fd9 100644 --- a/templates/boot/isolinux/isolinux.cfg +++ b/templates/boot/isolinux/isolinux.cfg @@ -101,6 +101,32 @@ label prosp2nw endtext +label prosp1 + menu label Install sip:providerPRO - sp1 DHCP + 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 ngcpnw.dhcp + + text help + Install sip:provider professional edition. + Install first node of HA setup. + + Retrieve network configuration via DHCP. + endtext + + +label prosp2 + menu label Install sip:providerPRO - sp2 DHCP + 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 ngcpnw.dhcp + + text help + Install sip:provider professional edition. + Install second node of HA setup. + + Retrieve network configuration via DHCP. + endtext + + ## begin of Debian menu {{{ menu separator @@ -288,6 +314,30 @@ label prosp2nw-trunk in boot command line if necessary. endtext +label prosp1-trunk + menu label sip:providerPRO - sp1 DHCP/ trunk 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 ngcptrunk ngcpnoupload ngcpnw.dhcp + + text help + Install sip:provider + professional edition, trunk version. + Install first node of HA setup. + Retrieve network configuration via DHCP. + endtext + +label prosp2-trunk + menu label sip:providerPRO - sp2 DHCP/ trunk 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 ngcptrunk ngcpnoupload ngcpnw.dhcp + + text help + Install sip:provider + professional edition, trunk version. + Install second node of HA setup. + Retrieve network configuration via DHCP. + endtext + include sipwise_pro.cfg # back to main menu