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

MT#6253 Enable ngcpnw.dhcp for DHCP entries, use Google's DNS server, add missing Debian/wheezy entries to Grub

Browse Source 
dns=92.42.136.30 doesn't work for the public so switch to
dns=8.8.8.8 instead, at least in the configs we use for
building the public Grml-Sipwise deployment ISO.
changes/06/606/1
Michael Prokop 12 years ago
parent 5361bac286
commit 9a3f98dd8f
10 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File

4
grub.cfg_ce
Unescape View File

@ -1,13 +1,13 @@
menuentry "sip:providerCE (DHCP) - version ##VERSION##" { menuentry "sip:providerCE (DHCP) - version ##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=##DIST## netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpvers=##VERSION## 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=##DIST## netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpvers=##VERSION## ngcpnw.dhcp
echo 'Loading initrd...' echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img initrd /boot/%SHORT_NAME%/initrd.img
} }
menuentry "sip:providerCE (static NW) - version ##VERSION##" { menuentry "sip:providerCE (static NW) - version ##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=##DIST## netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpvers=##VERSION## dns=92.42.136.30 ip=10.15.20.123::10.15.20.1:255.255.255.0:spce:eth0:off 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=##DIST## netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpvers=##VERSION## dns=8.8.8.8 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
} }

2
grub.cfg_latest
Unescape View File

@ -1,6 +1,6 @@
menuentry "Install ##VERSION## sip:providerCE - DHCP" { menuentry "Install ##VERSION## sip:providerCE - DHCP" {
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 noquick distri=grml-sipwise ngcpce ssh=sipwise debianrelease=##DIST## scripts ngcphostname=spce linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ngcpce ssh=sipwise debianrelease=##DIST## scripts ngcphostname=spce ngcpnw.dhcp
echo 'Loading initrd...' echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img initrd /boot/%SHORT_NAME%/initrd.img
} }

2
grub.cfg_lts
Unescape View File

@ -1,6 +1,6 @@
menuentry "Install ##VERSION## LTS sip:providerCE - DHCP" { menuentry "Install ##VERSION## LTS sip:providerCE - DHCP" {
echo 'Loading kernel...' echo 'Loading kernel...'
linux /boot/%SHORT_NAME%/vmlinuz initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ngcpce ssh=sipwise debianrelease=##DIST## ngcpvers=##VERSION## scripts ngcphostname=spce linux /boot/%SHORT_NAME%/vmlinuz initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ngcpce ssh=sipwise debianrelease=##DIST## ngcpvers=##VERSION## scripts ngcphostname=spce ngcpnw.dhcp
echo 'Loading initrd...' echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img initrd /boot/%SHORT_NAME%/initrd.img
} }

4
grub.cfg_pro
Unescape View File

@ -1,13 +1,13 @@
menuentry "sip:providerPRO - sp1 / ##VERSION## release" { menuentry "sip:providerPRO - sp1 / ##VERSION## 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=##DIST## netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ngcpvers=##VERSION## dns=92.42.136.30 ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off 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/kantan/deployment.sh ngcpsp1 ngcpvers=##VERSION## dns=8.8.8.8 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 / ##VERSION## release" { menuentry "sip:providerPRO - sp2 / ##VERSION## 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=##DIST## netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ngcpvers=##VERSION## dns=92.42.136.30 ip=10.15.20.102::10.15.20.1:255.255.255.0:sp2:eth0:off 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/kantan/deployment.sh ngcpsp2 ngcpvers=##VERSION## dns=8.8.8.8 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
} }

4
isolinux.cfg_ce
Unescape View File

@ -1,7 +1,7 @@
label ce##VERSION## label ce##VERSION##
menu label sip:providerCE (DHCP) - version ##VERSION## menu label sip:providerCE (DHCP) - version ##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=##DIST## netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpvers=##VERSION## 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=##DIST## netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpnw.dhcp ngcpvers=##VERSION##
text help text help
Install sip:provider community edition, Install sip:provider community edition,
@ -13,7 +13,7 @@ label ce##VERSION##
label cenw##VERSION## label cenw##VERSION##
menu label sip:providerCE (static NW) - version ##VERSION## menu label sip:providerCE (static NW) - version ##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=##DIST## netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce dns=92.42.136.30 ngcpvers=##VERSION## ip=10.15.20.123::10.15.20.1:255.255.255.0:spce: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 ngcpce ssh=sipwise debianrelease=##DIST## netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpvers=##VERSION## ip=10.15.20.123::10.15.20.1:255.255.255.0:spce:eth0:off dns=8.8.8.8
text help text help
Install sip:provider community edition, Install sip:provider community edition,

2
isolinux.cfg_latest
Unescape View File

@ -1,7 +1,7 @@
label ce##VERSION## label ce##VERSION##
menu label Install ##VERSION## sip:providerCE - DHCP menu label Install ##VERSION## sip:providerCE - DHCP
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 noquick distri=grml-sipwise ngcpce ssh=sipwise debianrelease=##DIST## scripts ngcphostname=spce append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ngcpce ssh=sipwise debianrelease=##DIST## scripts ngcphostname=spce ngcpnw.dhcp
text help text help
Install sip:provider community edition, Install sip:provider community edition,

2
isolinux.cfg_lts
Unescape View File

@ -1,7 +1,7 @@
label celts##VERSION## label celts##VERSION##
menu label Install ##VERSION## LTS sip:providerCE - DHCP menu label Install ##VERSION## LTS sip:providerCE - DHCP
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 noquick distri=grml-sipwise ngcpce ssh=sipwise debianrelease=##DIST## ngcpvers=##VERSION## scripts ngcphostname=spce append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick distri=grml-sipwise ngcpce ssh=sipwise debianrelease=##DIST## ngcpvers=##VERSION## scripts ngcphostname=spce ngcpnw.dhcp
text help text help
Install sip:provider community edition, Install sip:provider community edition,

4
isolinux.cfg_pro
Unescape View File

@ -1,7 +1,7 @@
label prosp1nw-##VERSION## label prosp1nw-##VERSION##
menu label sip:providerPRO - sp1 / ##VERSION## release menu label sip:providerPRO - sp1 / ##VERSION## 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=##DIST## netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ngcpvers=##VERSION## dns=92.42.136.30 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/kantan/deployment.sh ngcpsp1 ngcpvers=##VERSION## dns=8.8.8.8 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
@ -14,7 +14,7 @@ label prosp1nw-##VERSION##
label prosp2nw-##VERSION## label prosp2nw-##VERSION##
menu label sip:providerPRO - sp2 / ##VERSION## release menu label sip:providerPRO - sp2 / ##VERSION## 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=##DIST## netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ngcpvers=##VERSION## dns=92.42.136.30 ip=10.15.20.102::10.15.20.1:255.255.255.0:sp2: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/kantan/deployment.sh ngcpsp2 ngcpvers=##VERSION## dns=8.8.8.8 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

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

@ -11,7 +11,7 @@ menuentry "Rescue system boot (%VERSION%)" {
menuentry "Install sip:providerCE - DHCP" { menuentry "Install sip:providerCE - DHCP" {
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 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 ngcpnw.dhcp
echo 'Loading initrd...' echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img initrd /boot/%SHORT_NAME%/initrd.img
} }
@ -39,6 +39,28 @@ menuentry "Install sip:providerPRO - sp2" {
## submenus ## submenus
submenu "Install Debian ... ->" --class=submenu { submenu "Install Debian ... ->" --class=submenu {
menuentry "Install Debian/wheezy 64bit - DHCP" {
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=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh
echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "Install Debian/wheezy 64bit - static NW" {
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=wheezy 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...'
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "Install Debian/wheezy 64bit - Puppet" {
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=wheezy 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...'
initrd /boot/%SHORT_NAME%/initrd.img
}
menuentry "Install Debian/squeeze 64bit - DHCP" { menuentry "Install Debian/squeeze 64bit - DHCP" {
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 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
@ -65,7 +87,7 @@ submenu "Specific sip:providerCE releases ... ->" --class=submenu {
menuentry "sip:providerCE (DHCP) - trunk version" { menuentry "sip:providerCE (DHCP) - 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 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 ngcpnw.dhcp
echo 'Loading initrd...' echo 'Loading initrd...'
initrd /boot/%SHORT_NAME%/initrd.img initrd /boot/%SHORT_NAME%/initrd.img
} }

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

@ -56,7 +56,7 @@ label grml
label ce label ce
menu label Install sip:providerCE - DHCP menu label Install sip:providerCE - DHCP
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 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 ngcpnw.dhcp
text help text help
Install sip:provider community edition. Install sip:provider community edition.
@ -225,7 +225,7 @@ menu separator
label cetrunk label cetrunk
menu label sip:providerCE (DHCP) - trunk version menu label sip:providerCE (DHCP) - 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 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 ngcpnw.dhcp
text help text help
Install sip:provider community edition, Install sip:provider community edition,

Write Preview
Loading…
Cancel
Save