sipwise
/
deployment-iso
mirror of https://github.com/sipwise/deployment-iso.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#7365 Move ip= option to the end, use Vienna IPs (stable release iso)

Browse Source
changes/06/606/1
Alexander Lutay 12 years ago
parent b358e3c067
commit b9a05e9553
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

16
templates/boot/grub/grub.cfg
Unescape View File

@ -18,21 +18,21 @@ menuentry "Install sip:providerCE - DHCP" {
menuentry "Install sip:providerCE - static NW config" { menuentry "Install sip:providerCE - static NW config" {
echo 'Loading kernel...' 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 debianrelease=wheezy 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=92.42.136.30 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 debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce dns=92.42.136.30 ip=10.15.20.123::10.15.20.1:255.255.255.0:spce:eth0:off
echo 'Loading initrd...' echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img initrd /boot/%SHORT_NAME%/initrd.img
} }
menuentry "Install sip:providerPRO - sp1" { menuentry "Install sip:providerPRO - sp1" {
echo 'Loading kernel...' 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 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=92.42.136.30 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 dns=92.42.136.30 ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off
echo 'Loading initrd...' echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img initrd /boot/%SHORT_NAME%/initrd.img
} }
menuentry "Install sip:providerPRO - sp2" { menuentry "Install sip:providerPRO - sp2" {
echo 'Loading kernel...' 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 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=92.42.136.30 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 dns=92.42.136.30 ip=10.15.20.102::10.15.20.1:255.255.255.0:sp2:eth0:off
echo 'Loading initrd...' echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img initrd /boot/%SHORT_NAME%/initrd.img
} }
@ -48,14 +48,14 @@ menuentry "Install Debian/squeeze 64bit - DHCP" {
menuentry "Install Debian/squeeze 64bit - static NW" { menuentry "Install Debian/squeeze 64bit - static NW" {
echo 'Loading kernel...' 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 nongcp ssh=sipwise debianrelease=squeeze netscript=http://deb.sipwise.com/kantan/deployment.sh ip=192.168.51.123::192.168.51.1:255.255.255.0:debian:eth0:off dns=92.42.136.30 linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce nongcp ssh=sipwise debianrelease=squeeze netscript=http://deb.sipwise.com/kantan/deployment.sh dns=92.42.136.30 ip=10.15.20.123::10.15.20.1:255.255.255.0:debian:eth0:off
echo 'Loading initrd...' echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img initrd /boot/%SHORT_NAME%/initrd.img
} }
menuentry "Install Debian/squeeze 64bit - Puppet" { menuentry "Install Debian/squeeze 64bit - Puppet" {
echo 'Loading kernel...' 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 nongcp ssh=sipwise debianrelease=squeeze netscript=http://deb.sipwise.com/kantan/deployment.sh ip=192.168.51.123::192.168.51.1:255.255.255.0:puppet-client42:eth0:off dns=92.42.136.30 puppetenv=production linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce nongcp ssh=sipwise debianrelease=squeeze netscript=http://deb.sipwise.com/kantan/deployment.sh puppetenv=production dns=92.42.136.30 ip=10.15.20.123::10.15.20.1:255.255.255.0:puppet-client42:eth0:off
echo 'Loading initrd...' echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img initrd /boot/%SHORT_NAME%/initrd.img
} }
@ -72,7 +72,7 @@ menuentry "sip:providerCE (DHCP) - trunk version" {
menuentry "sip:providerCE (static NW) - trunk version" { menuentry "sip:providerCE (static NW) - trunk version" {
echo 'Loading kernel...' 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 debianrelease=wheezy 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=92.42.136.30 ngcptrunk ngcpnoupload 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 debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcptrunk ngcpnoupload dns=92.42.136.30 ip=10.15.20.123::10.15.20.1:255.255.255.0:spce:eth0:off
echo 'Loading initrd...' echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img initrd /boot/%SHORT_NAME%/initrd.img
} }
@ -86,14 +86,14 @@ submenu "Specific sip:providerPRO releases ... ->" --class=submenu {
menuentry "sip:providerPRO - sp1 / trunk release" { menuentry "sip:providerPRO - sp1 / trunk release" {
echo 'Loading kernel...' 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 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=92.42.136.30 ngcptrunk ngcpnoupload 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 dns=92.42.136.30 ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off
echo 'Loading initrd...' echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img initrd /boot/%SHORT_NAME%/initrd.img
} }
menuentry "sip:providerPRO - sp2 / trunk release" { menuentry "sip:providerPRO - sp2 / trunk release" {
echo 'Loading kernel...' 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 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=92.42.136.30 ngcptrunk ngcpnoupload 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 dns=92.42.136.30 ip=10.15.20.102::10.15.20.1:255.255.255.0:sp2:eth0:off
echo 'Loading initrd...' echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img initrd /boot/%SHORT_NAME%/initrd.img
} }

6
templates/boot/isolinux/isolinux.cfg
Unescape View File

@ -240,7 +240,7 @@ label cetrunk
label cenwtrunk label cenwtrunk
menu label sip:providerCE (static NW) - trunk version menu label sip:providerCE (static NW) - trunk version
kernel /boot/%SHORT_NAME%/vmlinuz 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 debianrelease=wheezy 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=92.42.136.30 ngcptrunk ngcpnoupload 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 debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcptrunk ngcpnoupload dns=92.42.136.30 ip=10.15.20.123::10.15.20.1:255.255.255.0:spce:eth0:off
text help text help
Install sip:provider Install sip:provider
@ -271,7 +271,7 @@ menu separator
label prosp1nw-trunk label prosp1nw-trunk
menu label sip:providerPRO - sp1 / trunk release menu label sip:providerPRO - sp1 / trunk release
kernel /boot/%SHORT_NAME%/vmlinuz 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 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=92.42.136.30 ngcptrunk ngcpnoupload 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 ngcpnoupload dns=92.42.136.30 ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off
text help text help
Install sip:provider Install sip:provider
@ -284,7 +284,7 @@ label prosp1nw-trunk
label prosp2nw-trunk label prosp2nw-trunk
menu label sip:providerPRO - sp2 / trunk release menu label sip:providerPRO - sp2 / trunk release
kernel /boot/%SHORT_NAME%/vmlinuz 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 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=92.42.136.30 ngcptrunk ngcpnoupload 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 dns=92.42.136.30 ip=10.15.20.102::10.15.20.1:255.255.255.0:sp2:eth0:off
text help text help
Install sip:provider Install sip:provider

Write Preview
Loading…
Cancel
Save