From 0b42bcdc675ed76d6e6ff193b0ad237fe3e085d9 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 7 Jan 2013 13:07:14 +0000 Subject: [PATCH] Update boot splash templates for 2.7 release From: Michael Prokop --- templates/boot/grub/grub.cfg | 36 +++++++++++++++-- templates/boot/isolinux/isolinux.cfg | 58 ++++++++++++++++++++++++++-- 2 files changed, 86 insertions(+), 8 deletions(-) diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg index 0689349..67becea 100644 --- a/templates/boot/grub/grub.cfg +++ b/templates/boot/grub/grub.cfg @@ -79,14 +79,28 @@ menuentry "sip:providerCE (static NW) - trunk version" { menuentry "sip:providerCE (DHCP) - pre-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 ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpautobuildrelease=2.6-rc1 + linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpautobuildrelease=2.8-rc1 echo 'Loading initrd...' initrd /boot/%SHORT_NAME%/initrd.img } menuentry "sip:providerCE (static NW) - pre-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 ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ip=192.168.51.123::192.168.51.1:255.255.255.0:spce:eth0:off dns=192.168.51.2 ngcpautobuildrelease=2.6-rc1 + linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ip=192.168.51.123::192.168.51.1:255.255.255.0:spce:eth0:off dns=192.168.51.2 ngcpautobuildrelease=2.8-rc1 + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + +menuentry "sip:providerCE (DHCP) - version 2.7" { + 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 ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpvers=2.7 + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + +menuentry "sip:providerCE (static NW) - version 2.7" { + 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 ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ip=192.168.51.123::192.168.51.1:255.255.255.0:spce:eth0:off dns=192.168.51.2 ngcpvers=2.7 echo 'Loading initrd...' initrd /boot/%SHORT_NAME%/initrd.img } @@ -182,14 +196,28 @@ menuentry "sip:providerPRO - sp2 / trunk release" { menuentry "sip:providerPRO - sp1 / pre-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 netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=195.58.160.194 ngcpautobuildrelease=2.6-rc1 + 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 netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=195.58.160.194 ngcpautobuildrelease=2.8-rc1 echo 'Loading initrd...' initrd /boot/%SHORT_NAME%/initrd.img } menuentry "sip:providerPRO - sp2 / pre-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 netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=195.58.160.194 ngcpautobuildrelease=2.6-rc1 + 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 netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=195.58.160.194 ngcpautobuildrelease=2.8-rc1 + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + +menuentry "sip:providerPRO - sp1 / 2.7 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 netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=195.58.160.194 ngcpvers=2.7 + echo 'Loading initrd...' + initrd /boot/%SHORT_NAME%/initrd.img +} + +menuentry "sip:providerPRO - sp2 / 2.7 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 netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=195.58.160.194 ngcpvers=2.7 echo 'Loading initrd...' initrd /boot/%SHORT_NAME%/initrd.img } diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg index 261f39d..3ddc954 100644 --- a/templates/boot/isolinux/isolinux.cfg +++ b/templates/boot/isolinux/isolinux.cfg @@ -190,7 +190,7 @@ label cenwtrunk label cepre menu label sip:providerCE (DHCP) - pre-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 ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpautobuildrelease=2.6-rc1 + append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpautobuildrelease=2.8-rc1 text help Install sip:provider @@ -202,7 +202,7 @@ label cepre label cenwpre menu label sip:providerCE (static NW) - pre-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 ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ip=192.168.51.123::192.168.51.1:255.255.255.0:spce:eth0:off dns=192.168.51.2 ngcpautobuildrelease=2.6-rc1 + append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ip=192.168.51.123::192.168.51.1:255.255.255.0:spce:eth0:off dns=192.168.51.2 ngcpautobuildrelease=2.8-rc1 text help Install sip:provider @@ -211,6 +211,30 @@ label cenwpre in boot command line if necessary. endtext +label ce2.7 + menu label sip:providerCE (DHCP) - version 2.7 + 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 ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpvers=2.7 + + text help + Install sip:provider + community edition, version 2.7. + Retrieve network configuration + via DHCP. + endtext + +label cenw2.7 + menu label sip:providerCE (static NW) - version 2.7 + 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 ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ip=192.168.51.123::192.168.51.1:255.255.255.0:spce:eth0:off dns=192.168.51.2 ngcpvers=2.7 + + text help + Install sip:provider + community edition, version 2.7. + Use static IP configuration, adjust + in boot command line if necessary. + endtext + label ce2.6 menu label sip:providerCE (DHCP) - version 2.6 kernel /boot/%SHORT_NAME%/vmlinuz @@ -377,7 +401,7 @@ label prosp2nw-trunk label prosp1nw-pre menu label sip:providerPRO - sp1 / pre-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 netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=195.58.160.194 ngcpautobuildrelease=2.6-rc1 + 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 netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=195.58.160.194 ngcpautobuildrelease=2.8-rc1 text help Install sip:provider @@ -390,7 +414,7 @@ label prosp1nw-pre label prosp2nw-pre menu label sip:providerPRO - sp2 / pre-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 netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=195.58.160.194 ngcpautobuildrelease=2.6-rc1 + 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 netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=195.58.160.194 ngcpautobuildrelease=2.8-rc1 text help Install sip:provider @@ -400,6 +424,32 @@ label prosp2nw-pre in boot command line if necessary. endtext +label prosp1nw-2.7 + menu label sip:providerPRO - sp1 / 2.7 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 netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=195.58.160.194 ngcpvers=2.7 + + text help + Install sip:provider + professional edition, version 2.7. + Install first node of HA setup. + Use static IP configuration, adjust + in boot command line if necessary. + endtext + +label prosp2nw-2.7 + menu label sip:providerPRO - sp2 / 2.7 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 netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=195.58.160.194 ngcpvers=2.7 + + text help + Install sip:provider + professional edition, version 2.7. + Install second node of HA setup. + Use static IP configuration, adjust + in boot command line if necessary. + endtext + label prosp1nw-2.6 menu label sip:providerPRO - sp1 / 2.6 release kernel /boot/%SHORT_NAME%/vmlinuz