From 160c3b1ec6cda2b3b8206cbd2367a7e8a4c681ee Mon Sep 17 00:00:00 2001
From: Alexander Lutay <alutay@sipwise.com>
Date: Tue, 23 Sep 2014 15:11:43 +0200
Subject: [PATCH] MT#9191 Add initial Carrier 3.x menu for daily and release
 ISOs

---
 templates/boot/grub/grub.cfg         | 21 ++++++++++++++
 templates/boot/isolinux/isolinux.cfg | 42 ++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index c963b1b..deacf17 100644
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -153,6 +153,27 @@ source /boot/grub/sipwise_pro.cfg
 
 } # Specific sip:providerPRO releases
 
+## begin of Carrier 3.x menu {{{
+submenu "Specific sip:Carrier 3.x releases ... ->" --class=submenu {
+
+menuentry "sip:Carrier 3.x - first (mgmt/web01a) / trunk" {
+  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 ngcpnonwrecfg ngcpcrole=mgmt ngcphostname=web01a 
+  echo 'Loading initrd...'
+  initrd /boot/%SHORT_NAME%/initrd.img
+}
+
+menuentry "sip:Carrier 3.x - other / 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 ngcpnonwrecfg ngcpcrole=[mgmt|db|proxy|lb] ngcphostname=FIXME01a ngcpmgmt=X.X.X.X 
+  echo 'Loading initrd...'
+  initrd /boot/%SHORT_NAME%/initrd.img
+}
+
+source /boot/grub/sipwise_pro.cfg
+
+} # Specific sip:providerCarrier 3.x releases
+
 source /boot/grub/addons.cfg
 source /boot/grub/footer.cfg
 
diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg
index bb03fd9..6e6343f 100644
--- a/templates/boot/isolinux/isolinux.cfg
+++ b/templates/boot/isolinux/isolinux.cfg
@@ -348,6 +348,48 @@ kernel isolinux.bin
 menu end
 ## end of PRO menu }}}
 
+## begin of CARRIER menu {{{
+menu begin pro-options
+menu title Specific sip:Carrier 3.X releases ...
+
+label mainmenu
+menu label ^Back to main menu...
+menu exit
+menu separator
+
+label carrierfirst
+  menu label Install sip:Carrier 3.x - mgmt/web01a (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 ngcpnonwrecfg ngcpcrole=mgmt ngcphostname=web01a 
+
+  text help
+                                     Install sip:carrier edition.
+                                     Install first node of Carrier 3.x setup.
+
+                                     Retrieve network configuration via DHCP.
+  endtext
+
+
+label carrierother
+  menu label Install sip:Carrier 3.x - other nodes (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 ngcpnonwrecfg ngcpcrole=[mgmt|db|proxy|lb] ngcphostname=FIXME01a ngcpmgmt=X.X.X.X 
+
+  text help
+                                     Install sip:carrier edition.
+                                     Install other nodes of Carrier 3.x setup.
+
+                                     Retrieve network configuration via DHCP.
+  endtext
+
+# back to main menu
+label quit
+menu hide
+kernel isolinux.bin
+
+menu end
+## end of CARRIER menu }}}
+
 ## begin of other bootoptions menu {{{
 menu separator
 menu begin other-options