From 5148102f9bce5943a8db0003d90f169dec2da8d1 Mon Sep 17 00:00:00 2001 From: Alexander Lutay Date: Thu, 26 Mar 2015 15:09:18 +0100 Subject: [PATCH] MT#9249 Add boot option 'ngcpfillcache' for Carrier Change-Id: I508d2d152bd513ce6a0a139f02be7891f8fbb790 --- grub.cfg_carrier | 4 ++-- isolinux.cfg_carrier | 4 ++-- templates/boot/grub/grub.cfg | 4 ++-- templates/boot/isolinux/isolinux.cfg | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/grub.cfg_carrier b/grub.cfg_carrier index 91a5c5f..b42c238 100644 --- a/grub.cfg_carrier +++ b/grub.cfg_carrier @@ -1,13 +1,13 @@ menuentry "sip:Carrier mgmt (web01a) 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/netscript/##VERSION##/deployment.sh ngcpsp1 ngcpnoupload ngcpnw.dhcp ngcpvers=##VERSION## ngcpcrole=mgmt ngcpnonwrecfg ngcphostname=web01a + 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/netscript/##VERSION##/deployment.sh ngcpsp1 ngcpnoupload ngcpnw.dhcp ngcpfillcache ngcpvers=##VERSION## ngcpcrole=mgmt ngcpnonwrecfg ngcphostname=web01a echo 'Loading initrd...' initrd /boot/%SHORT_NAME%/initrd.img } menuentry "sip:Carrier mgmt (web01a) / ##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/netscript/##VERSION##/deployment.sh ngcpsp1 ngcpnoupload ngcpnonwrecfg ngcpvers=##VERSION## dns=92.42.136.30 ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off ngcpcrole=mgmt ngcphostname=web01a + 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/netscript/##VERSION##/deployment.sh ngcpsp1 ngcpnoupload ngcpnonwrecfg ngcpfillcache ngcpvers=##VERSION## dns=92.42.136.30 ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off ngcpcrole=mgmt ngcphostname=web01a echo 'Loading initrd...' initrd /boot/%SHORT_NAME%/initrd.img } diff --git a/isolinux.cfg_carrier b/isolinux.cfg_carrier index 6f6b8db..4336966 100644 --- a/isolinux.cfg_carrier +++ b/isolinux.cfg_carrier @@ -1,7 +1,7 @@ label carrier##VERSION## menu label sip:Carrier mgmt/web01a DHCP / ##VERSION## 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/netscript/##VERSION##/deployment.sh ngcpsp1 ngcpnw.dhcp ngcpnonwrecfg ngcpvers=##VERSION## ngcpcrole=mgmt ngcphostname=web01a + 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/netscript/##VERSION##/deployment.sh ngcpsp1 ngcpnw.dhcp ngcpnonwrecfg ngcpfillcache ngcpvers=##VERSION## ngcpcrole=mgmt ngcphostname=web01a text help Install sip:Carrier version ##VERSION##. @@ -15,7 +15,7 @@ label carrier##VERSION## label carriernw##VERSION## menu label sip:Carrier mgmt/web01a / ##VERSION## 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/netscript/##VERSION##/deployment.sh ngcpsp1 ngcpnoupload ngcpvers=##VERSION## dns=92.42.136.30 ngcpnonwrecfg ngcpcrole=mgmt ngcphostname=web01a ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off + 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/netscript/##VERSION##/deployment.sh ngcpsp1 ngcpnoupload ngcpfillcache ngcpvers=##VERSION## dns=92.42.136.30 ngcpnonwrecfg ngcpcrole=mgmt ngcphostname=web01a ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off text help Install sip:Carrier version ##VERSION##. diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg index c1cf4e5..3f2035b 100644 --- a/templates/boot/grub/grub.cfg +++ b/templates/boot/grub/grub.cfg @@ -158,14 +158,14 @@ submenu "Specific sip:Carrier releases ... ->" --class=submenu { menuentry "sip:Carrier 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/netscript/master/deployment.sh ngcpsp1 ngcpnoupload ngcpnw.dhcp ngcptrunk ngcpcrole=mgmt ngcpnonwrecfg ngcphostname=web01a + 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/netscript/master/deployment.sh ngcpsp1 ngcpnoupload ngcpfillcache ngcpnw.dhcp ngcptrunk ngcpcrole=mgmt ngcpnonwrecfg ngcphostname=web01a echo 'Loading initrd...' initrd /boot/%SHORT_NAME%/initrd.img } menuentry "sip:Carrier 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/netscript/master/deployment.sh ngcpsp1 ngcpnoupload ngcpnonwrecfg dns=92.42.136.30 ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off ngcptrunk ngcpcrole=mgmt ngcphostname=web01a + 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/netscript/master/deployment.sh ngcpsp1 ngcpnoupload ngcpfillcache ngcpnonwrecfg dns=92.42.136.30 ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off ngcptrunk ngcpcrole=mgmt ngcphostname=web01a echo 'Loading initrd...' initrd /boot/%SHORT_NAME%/initrd.img } diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg index c893b17..24f9e2a 100644 --- a/templates/boot/isolinux/isolinux.cfg +++ b/templates/boot/isolinux/isolinux.cfg @@ -360,7 +360,7 @@ menu separator label carrierweb01atrunkdhcp menu label sip:Carrier 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/netscript/master/deployment.sh ngcpsp1 ngcptrunk ngcpnw.dhcp ngcpnonwrecfg ngcpcrole=mgmt ngcphostname=web01a + 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/netscript/master/deployment.sh ngcpsp1 ngcptrunk ngcpnw.dhcp ngcpnonwrecfg ngcpfillcache ngcpcrole=mgmt ngcphostname=web01a text help Install sip:Carrier edition (trunk). @@ -374,7 +374,7 @@ label carrierweb01atrunkdhcp label carrierweb01atrunkstatic menu label sip:Carrier 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/netscript/master/deployment.sh ngcpsp1 ngcptrunk ngcpnoupload ngcpnonwrecfg dns=92.42.136.30 ngcpcrole=mgmt ngcphostname=web01a ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off + 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/netscript/master/deployment.sh ngcpsp1 ngcptrunk ngcpnoupload ngcpnonwrecfg dns=92.42.136.30 ngcpfillcache ngcpcrole=mgmt ngcphostname=web01a ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off text help Install sip:Carrier edition (trunk).