From ffbaf368915e2cced29eb840fefd7e6b4127d1a9 Mon Sep 17 00:00:00 2001 From: Alexander Lutay Date: Tue, 23 Sep 2014 17:15:44 +0200 Subject: [PATCH] MT#9191 Restore ngcptrunk option for isolinux Carrier 3.X --- templates/boot/isolinux/isolinux.cfg | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg index c9107dd..911793b 100644 --- a/templates/boot/isolinux/isolinux.cfg +++ b/templates/boot/isolinux/isolinux.cfg @@ -360,7 +360,7 @@ menu separator label carrierweb01a menu label Install sip:Carrier 3.x - web01a / 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 ngcpnw.dhcp ngcpcrole=mgmt ngcphostname=web01a ngcpnonwrecfg + 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. @@ -373,7 +373,7 @@ label carrierweb01a label carrierweb01b menu label Install sip:Carrier 3.x - web01b / 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 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 ngcpnw.dhcp ngcpcrole=mgmt ngcphostname=web01b ngcpnonwrecfg ngcpmgmt=X.X.X.X text help Install sip:carrier edition. @@ -386,7 +386,7 @@ label carrierweb01b 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 ngcpnw.dhcp ngcpcrole=db ngcphostname=db01a 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 ngcpsp1 ngcptrunk ngcpnw.dhcp ngcpcrole=db ngcphostname=db01a ngcpnonwrecfg ngcpmgmt=X.X.X.X text help Install sip:carrier edition. @@ -399,7 +399,7 @@ label carrierdb01a 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 ngcpnw.dhcp ngcpcrole=db ngcphostname=db01b 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 ngcpnw.dhcp ngcpcrole=db ngcphostname=db01b ngcpnonwrecfg ngcpmgmt=X.X.X.X text help Install sip:carrier edition. @@ -412,7 +412,7 @@ label carrierdb01b 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 ngcpnw.dhcp ngcpcrole=lb ngcphostname=lb01a 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 ngcpsp1 ngcptrunk ngcpnw.dhcp ngcpcrole=lb ngcphostname=lb01a ngcpnonwrecfg ngcpmgmt=X.X.X.X text help Install sip:carrier edition. @@ -425,7 +425,7 @@ label carrierlb01a 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 ngcpnw.dhcp ngcpcrole=lb ngcphostname=lb01b 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 ngcpnw.dhcp ngcpcrole=lb ngcphostname=lb01b ngcpnonwrecfg ngcpmgmt=X.X.X.X text help Install sip:carrier edition. @@ -438,7 +438,7 @@ label carrierlb01b label carrierprx01a menu label Install sip:Carrier 3.x - prx01a / 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 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 ngcpsp1 ngcptrunk ngcpnw.dhcp ngcpcrole=proxy ngcphostname=prx01a ngcpnonwrecfg ngcpmgmt=X.X.X.X text help Install sip:carrier edition. @@ -451,7 +451,7 @@ label carrierprx01a label carrierprx01b menu label Install sip:Carrier 3.x - prx01b / 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 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 ngcpsp2 ngcptrunk ngcpnw.dhcp ngcpcrole=proxy ngcphostname=prx01b ngcpnonwrecfg ngcpmgmt=X.X.X.X text help Install sip:carrier edition.