From 9a3f98dd8ff6e0d9da5c72b8455d3d7f780af47b Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 11 Jul 2014 11:26:07 +0200 Subject: [PATCH] MT#6253 Enable ngcpnw.dhcp for DHCP entries, use Google's DNS server, add missing Debian/wheezy entries to Grub 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. --- grub.cfg_ce | 4 ++-- grub.cfg_latest | 2 +- grub.cfg_lts | 2 +- grub.cfg_pro | 4 ++-- isolinux.cfg_ce | 4 ++-- isolinux.cfg_latest | 2 +- isolinux.cfg_lts | 2 +- isolinux.cfg_pro | 4 ++-- templates/boot/grub/grub.cfg | 26 ++++++++++++++++++++++++-- templates/boot/isolinux/isolinux.cfg | 4 ++-- 10 files changed, 38 insertions(+), 16 deletions(-) diff --git a/grub.cfg_ce b/grub.cfg_ce index add765c..6e80eb3 100644 --- a/grub.cfg_ce +++ b/grub.cfg_ce @@ -1,13 +1,13 @@ menuentry "sip:providerCE (DHCP) - version ##VERSION##" { 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...' initrd /boot/%SHORT_NAME%/initrd.img } menuentry "sip:providerCE (static NW) - version ##VERSION##" { 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...' initrd /boot/%SHORT_NAME%/initrd.img } diff --git a/grub.cfg_latest b/grub.cfg_latest index c6ebb3d..4f5de61 100644 --- a/grub.cfg_latest +++ b/grub.cfg_latest @@ -1,6 +1,6 @@ menuentry "Install ##VERSION## sip:providerCE - 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 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...' initrd /boot/%SHORT_NAME%/initrd.img } diff --git a/grub.cfg_lts b/grub.cfg_lts index 1c11013..444da0e 100644 --- a/grub.cfg_lts +++ b/grub.cfg_lts @@ -1,6 +1,6 @@ menuentry "Install ##VERSION## LTS sip:providerCE - DHCP" { 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...' initrd /boot/%SHORT_NAME%/initrd.img } diff --git a/grub.cfg_pro b/grub.cfg_pro index 703af52..f74f7c2 100644 --- a/grub.cfg_pro +++ b/grub.cfg_pro @@ -1,13 +1,13 @@ menuentry "sip:providerPRO - sp1 / ##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/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...' initrd /boot/%SHORT_NAME%/initrd.img } menuentry "sip:providerPRO - sp2 / ##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/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...' initrd /boot/%SHORT_NAME%/initrd.img } diff --git a/isolinux.cfg_ce b/isolinux.cfg_ce index ce62754..1f52ed9 100644 --- a/isolinux.cfg_ce +++ b/isolinux.cfg_ce @@ -1,7 +1,7 @@ label ce##VERSION## menu label sip:providerCE (DHCP) - version ##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 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 Install sip:provider community edition, @@ -13,7 +13,7 @@ label ce##VERSION## label cenw##VERSION## menu label sip:providerCE (static NW) - version ##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 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 Install sip:provider community edition, diff --git a/isolinux.cfg_latest b/isolinux.cfg_latest index 0bd9ea3..b724178 100644 --- a/isolinux.cfg_latest +++ b/isolinux.cfg_latest @@ -1,7 +1,7 @@ label ce##VERSION## menu label Install ##VERSION## sip:providerCE - 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 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 Install sip:provider community edition, diff --git a/isolinux.cfg_lts b/isolinux.cfg_lts index f26acb2..f17d42d 100644 --- a/isolinux.cfg_lts +++ b/isolinux.cfg_lts @@ -1,7 +1,7 @@ label celts##VERSION## menu label Install ##VERSION## LTS sip:providerCE - 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 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 Install sip:provider community edition, diff --git a/isolinux.cfg_pro b/isolinux.cfg_pro index 781eb3e..bfd2f17 100644 --- a/isolinux.cfg_pro +++ b/isolinux.cfg_pro @@ -1,7 +1,7 @@ label prosp1nw-##VERSION## menu label sip:providerPRO - sp1 / ##VERSION## 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 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 Install sip:provider @@ -14,7 +14,7 @@ label prosp1nw-##VERSION## label prosp2nw-##VERSION## menu label sip:providerPRO - sp2 / ##VERSION## 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 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 Install sip:provider diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg index f1232db..811bdb2 100644 --- a/templates/boot/grub/grub.cfg +++ b/templates/boot/grub/grub.cfg @@ -11,7 +11,7 @@ menuentry "Rescue system boot (%VERSION%)" { menuentry "Install sip:providerCE - 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 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...' initrd /boot/%SHORT_NAME%/initrd.img } @@ -39,6 +39,28 @@ menuentry "Install sip:providerPRO - sp2" { ## submenus 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" { 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 @@ -65,7 +87,7 @@ submenu "Specific sip:providerCE releases ... ->" --class=submenu { menuentry "sip:providerCE (DHCP) - trunk version" { 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...' initrd /boot/%SHORT_NAME%/initrd.img } diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg index feee9aa..541c6d2 100644 --- a/templates/boot/isolinux/isolinux.cfg +++ b/templates/boot/isolinux/isolinux.cfg @@ -56,7 +56,7 @@ label grml label ce menu label Install sip:providerCE - 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 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 Install sip:provider community edition. @@ -225,7 +225,7 @@ menu separator label cetrunk menu label sip:providerCE (DHCP) - trunk 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 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 Install sip:provider community edition,