From 9ba39a698c0affa10b497276d40478fb4d38da63 Mon Sep 17 00:00:00 2001 From: Alexander Lutay Date: Fri, 5 Dec 2014 13:29:37 +0100 Subject: [PATCH] MT#10093 Update boot menus to support PXE Carrier 3.x setup Change-Id: I873b5e57c70f927c2d054658ace25d466a523752 --- templates/boot/grub/grub.cfg | 42 ++---------- templates/boot/isolinux/isolinux.cfg | 96 +++++++--------------------- 2 files changed, 31 insertions(+), 107 deletions(-) diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg index 39f8d90..342514a 100644 --- a/templates/boot/grub/grub.cfg +++ b/templates/boot/grub/grub.cfg @@ -156,58 +156,30 @@ source /boot/grub/sipwise_pro.cfg ## begin of Carrier 3.x menu {{{ submenu "Specific sip:Carrier 3.x releases ... ->" --class=submenu { -menuentry "sip:Carrier 3.x - web01a / trunk" { +menuentry "sip:Carrier 3.x PXE mgmt (web01a) DHCP / 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 ngcpcrole=mgmt ngcpnonwrecfg ngcphostname=web01a echo 'Loading initrd...' initrd /boot/%SHORT_NAME%/initrd.img } -menuentry "sip:Carrier 3.x - web01b / trunk" { +menuentry "sip:Carrier 3.x PXE 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 ngcpsp2 ngcptrunk ngcpnoupload ngcpnw.dhcp ngcpcrole=mgmt ngcphostname=web01b ngcpnonwrecfg ngcpmgmt=X.X.X.X + 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 ngcpcrole=mgmt ngcphostname=web01b ngcpnonwrecfg dns=92.42.136.30 ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off echo 'Loading initrd...' initrd /boot/%SHORT_NAME%/initrd.img } -menuentry "sip:Carrier 3.x - db01a / trunk" { +menuentry "sip:Carrier 3.x mgmt/db/proxy/lb DHCP / mr3.6.1" { 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 ngcpcrole=db ngcphostname=db01a ngcpnonwrecfg ngcpmgmt=X.X.X.X + 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 ngcpvers=mr3.6.1 ngcpnoupload ngcpnw.dhcp ngcpnonwrecfg ngcphostname=web01a_FIXME ngcpcrole=mgmt_FIXME ngcpsp1_FIXME echo 'Loading initrd...' initrd /boot/%SHORT_NAME%/initrd.img } -menuentry "sip:Carrier 3.x - db01b / trunk" { +menuentry "sip:Carrier 3.x mgmt/db/proxy/lb / mr3.6.1" { 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 ngcpcrole=db ngcphostname=db01b ngcpnonwrecfg ngcpmgmt=X.X.X.X - echo 'Loading initrd...' - initrd /boot/%SHORT_NAME%/initrd.img -} - -menuentry "sip:Carrier 3.x - lb01a / 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 ngcpcrole=lb ngcphostname=lb01a ngcpnonwrecfg ngcpmgmt=X.X.X.X - echo 'Loading initrd...' - initrd /boot/%SHORT_NAME%/initrd.img -} - -menuentry "sip:Carrier 3.x - lb01b / 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 ngcpsp2 ngcptrunk ngcpnoupload ngcpnw.dhcp ngcpcrole=lb ngcphostname=lb01b ngcpnonwrecfg ngcpmgmt=X.X.X.X - echo 'Loading initrd...' - initrd /boot/%SHORT_NAME%/initrd.img -} - -menuentry "sip:Carrier 3.x - prx01a / 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 ngcpcrole=proxy ngcphostname=prx01a ngcpnonwrecfg ngcpmgmt=X.X.X.X - echo 'Loading initrd...' - initrd /boot/%SHORT_NAME%/initrd.img -} - -menuentry "sip:Carrier 3.x - prx01b / 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 ngcpsp2 ngcptrunk ngcpnoupload ngcpnw.dhcp ngcpcrole=proxy ngcphostname=prx01b ngcpnonwrecfg ngcpmgmt=X.X.X.X + 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 ngcpvers=mr3.6.1 ngcpnoupload ngcpnw.dhcp ngcpnonwrecfg ngcphostname=web01a_FIXME ngcpcrole=mgmt_FIXME ngcpsp1_FIXME dns=92.42.136.30 ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off echo 'Loading initrd...' initrd /boot/%SHORT_NAME%/initrd.img } diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg index 911793b..d5f5c5f 100644 --- a/templates/boot/isolinux/isolinux.cfg +++ b/templates/boot/isolinux/isolinux.cfg @@ -357,107 +357,59 @@ menu label ^Back to main menu... menu exit menu separator -label carrierweb01a - menu label Install sip:Carrier 3.x - web01a / trunk (DHCP) +label carrierweb01atrunkdhcp + menu label sip:Carrier 3.x PXE mgmt/web01a DHCP / trunk 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 ngcpnw.dhcp ngcpcrole=mgmt ngcphostname=web01a ngcpnonwrecfg text help - Install sip:carrier edition. + Install sip:Carrier 3.x edition (trunk). Install web01a node of Carrier 3.x setup. + Other nodes will be installed from web01a. Retrieve network configuration via DHCP. endtext -label carrierweb01b - menu label Install sip:Carrier 3.x - web01b / trunk (DHCP) +label carrierweb01atrunkstatic + menu label sip:Carrier 3.x PXE mgmt/web01a / trunk 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 ngcpnw.dhcp ngcpcrole=mgmt ngcphostname=web01b ngcpnonwrecfg ngcpmgmt=X.X.X.X + 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 ngcpcrole=mgmt ngcphostname=web01b ngcpnonwrecfg dns=92.42.136.30 ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off text help - Install sip:carrier edition. - Install web01b nodes of Carrier 3.x setup. - - Retrieve network configuration via DHCP. - endtext - - -label carrierdb01a - menu label Install sip:Carrier 3.x - db01a / trunk (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 ngcptrunk ngcpnw.dhcp ngcpcrole=db ngcphostname=db01a ngcpnonwrecfg ngcpmgmt=X.X.X.X - - text help - Install sip:carrier edition. - Install db01a node of Carrier 3.x setup. - - Retrieve network configuration via DHCP. - endtext - - -label carrierdb01b - menu label Install sip:Carrier 3.x - db01b / trunk (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 ngcptrunk ngcpnw.dhcp ngcpcrole=db ngcphostname=db01b ngcpnonwrecfg ngcpmgmt=X.X.X.X - - text help - Install sip:carrier edition. - Install db01b nodes of Carrier 3.x setup. - - Retrieve network configuration via DHCP. - endtext - - -label carrierlb01a - menu label Install sip:Carrier 3.x - lb01a / trunk (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 ngcptrunk ngcpnw.dhcp ngcpcrole=lb ngcphostname=lb01a ngcpnonwrecfg ngcpmgmt=X.X.X.X - - text help - Install sip:carrier edition. - Install lb01a node of Carrier 3.x setup. - - Retrieve network configuration via DHCP. - endtext - - -label carrierlb01b - menu label Install sip:Carrier 3.x - lb01b / trunk (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 ngcptrunk ngcpnw.dhcp ngcpcrole=lb ngcphostname=lb01b ngcpnonwrecfg ngcpmgmt=X.X.X.X - - text help - Install sip:carrier edition. - Install lb01b nodes of Carrier 3.x setup. + Install sip:Carrier 3.x edition (trunk). + Install web01a node of Carrier 3.x setup. + Other nodes will be installed from web01a. - Retrieve network configuration via DHCP. + Static network configuration. endtext -label carrierprx01a - menu label Install sip:Carrier 3.x - prx01a / trunk (DHCP) +label carrieranymr361dhcp + menu label sip:Carrier 3.x mgmt/db/proxy/lb DHCP / mr3.6.1 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 ngcpnw.dhcp ngcpcrole=proxy ngcphostname=prx01a ngcpnonwrecfg ngcpmgmt=X.X.X.X + 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 ngcpvers=mr3.6.1 ngcpnoupload ngcpnw.dhcp ngcpnonwrecfg ngcphostname=web01a_FIXME ngcpcrole=mgmt_FIXME ngcpsp1_FIXME text help - Install sip:carrier edition. - Install prx01a node of Carrier 3.x setup. + Install sip:Carrier 3.x edition (mr3.6.1). + Install any node of Carrier 3.x setup. + Please configure boot options manually! Retrieve network configuration via DHCP. endtext -label carrierprx01b - menu label Install sip:Carrier 3.x - prx01b / trunk (DHCP) +label carrieranymr361static + menu label sip:Carrier 3.x mgmt/db/proxy/lb / mr3.6.1 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 ngcpnw.dhcp ngcpcrole=proxy ngcphostname=prx01b ngcpnonwrecfg ngcpmgmt=X.X.X.X + 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 ngcpvers=mr3.6.1 ngcpnoupload ngcpnw.dhcp ngcpnonwrecfg ngcphostname=web01a_FIXME ngcpcrole=mgmt_FIXME ngcpsp1_FIXME dns=92.42.136.30 ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off text help - Install sip:carrier edition. - Install prx01b nodes of Carrier 3.x setup. + Install sip:Carrier 3.x edition (mr3.6.1). + Install any node of Carrier 3.x setup. + Please configure boot options manually! - Retrieve network configuration via DHCP. + Static network configuration. endtext # back to main menu