MT#10277 Switch code to release-specific deployment.sh

Change-Id: Ia9428c566eb95dc673567e4219eb143bff4de3cb
11 years ago · 4118fdd8ad
parent fd1ad85aeb
commit 4118fdd8ad
13 changed files with 80 additions and 2679 deletions
--- a/16
+++ b/16
@ -1,7 +1,13 @@
 # for syntax checks
 BASH_SCRIPTS = ./templates-ce/scripts/main.sh ./templates-ce/scripts/includes/* ./build_iso.sh ./build_templates.sh

-VERSION=$(shell git log --pretty=format:"%h" -1 ./templates-ce/scripts/includes/deployment.sh)
+all: build
+
+build:
+	@echo -n "Downloading deployment.sh scripts"; \
+	wget -r --directory-prefix=./templates-ce/scripts/includes/netscript/ --reject "index.html*" \
+	--no-parent --no-host-directories --cut-dirs=1 "http://deb.sipwise.com/netscript/" ; \
+	echo " done."; \

 syntaxcheck: shellcheck

@ -14,10 +20,6 @@ shellcheck:
 	done; \
 	echo " done."; \

-script_version:
-	echo "Adjust version information string in ./templates-ce/scripts/includes/deployment.sh.sh to ${VERSION}"
-	sed -i "s/SCRIPT_VERSION=\"%SCRIPT_VERSION%\"/SCRIPT_VERSION=${VERSION}/" ./templates-ce/scripts/includes/deployment.sh
-
 clean:
 	rm -f templates-ce/boot/grub/sipwise_latest.cfg templates-ce/boot/grub/sipwise_lts.cfg \
 	  templates-ce/boot/isolinux/sipwise_latest.cfg templates-ce/boot/isolinux/sipwise_lts.cfg
@ -25,9 +27,9 @@ clean:
 	rm -f templates/boot/grub/sipwise_latest.cfg templates/boot/grub/sipwise_lts.cfg \
 	  templates/boot/isolinux/sipwise_latest.cfg templates/boot/isolinux/sipwise_lts.cfg
 	rm -f templates/boot/isolinux/syslinux.cfg
-	sed -i 's/^SCRIPT_VERSION=.*/SCRIPT_VERSION="%SCRIPT_VERSION%"/' ./templates-ce/scripts/includes/deployment.sh
+	rm -rf templates-ce/scripts/includes/netscript

 dist-clean: clean
 	rm -rf artifacts

-.PHONY: clean dist-clean syntaxcheck script_version
+.PHONY: clean dist-clean syntaxcheck build all
--- a/grub.cfg_carrier
+++ b/grub.cfg_carrier
@ -1,13 +1,13 @@
 menuentry "sip:Carrier mgmt (web01a) DHCP / ##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 ngcpnoupload ngcpnw.dhcp ngcpvers=##VERSION## ngcpcrole=mgmt ngcpnonwrecfg ngcphostname=web01a 
+  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/netscript/##VERSION##/deployment.sh ngcpsp1 ngcpnoupload ngcpnw.dhcp ngcpvers=##VERSION## ngcpcrole=mgmt ngcpnonwrecfg ngcphostname=web01a 
  echo 'Loading initrd...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }

 menuentry "sip:Carrier mgmt (web01a) / ##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 ngcpnoupload ngcpnonwrecfg ngcpvers=##VERSION## dns=92.42.136.30 ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off ngcpcrole=mgmt ngcphostname=web01a 
+  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/netscript/##VERSION##/deployment.sh ngcpsp1 ngcpnoupload ngcpnonwrecfg ngcpvers=##VERSION## dns=92.42.136.30 ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off ngcpcrole=mgmt ngcphostname=web01a 
  echo 'Loading initrd...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }
--- 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## ngcpnw.dhcp 
+  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/netscript/##VERSION##/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=8.8.8.8 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/netscript/##VERSION##/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
 }
--- a/grub.cfg_latest
+++ b/grub.cfg_latest
@ -1,13 +1,13 @@
 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 ngcpnw.dhcp 
+  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## ngcpvers=##VERSION## scripts ngcphostname=spce ngcpnw.dhcp 
  echo 'Loading initrd...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }

 menuentry "Install ##VERSION## sip:providerCE - static NW config" {
  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 ip=192.168.1.100::192.168.1.1:255.255.255.0:spce:eth0:off dns=8.8.8.8 
+  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## ngcpvers=##VERSION## scripts ngcphostname=spce ip=192.168.1.100::192.168.1.1:255.255.255.0:spce:eth0:off dns=8.8.8.8 
  echo 'Loading initrd...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }
--- a/grub.cfg_pro
+++ b/grub.cfg_pro
@ -1,27 +1,27 @@
 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=8.8.8.8 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/netscript/##VERSION##/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=8.8.8.8 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/netscript/##VERSION##/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
 }

 menuentry "sip:providerPRO - sp1 DHCP/ ##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## ngcpnw.dhcp 
+  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/netscript/##VERSION##/deployment.sh ngcpsp1 ngcpvers=##VERSION## ngcpnw.dhcp 
  echo 'Loading initrd...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }

 menuentry "sip:providerPRO - sp2 DHCP/ ##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## ngcpnw.dhcp 
+  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/netscript/##VERSION##/deployment.sh ngcpsp2 ngcpvers=##VERSION## ngcpnw.dhcp 
  echo 'Loading initrd...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }
--- a/isolinux.cfg_carrier
+++ b/isolinux.cfg_carrier
@ -1,7 +1,7 @@
 label carrier##VERSION##
  menu label sip:Carrier mgmt/web01a DHCP / ##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 ngcppro ssh=sipwise debianrelease=##DIST## netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ngcpnw.dhcp ngcpnonwrecfg ngcpvers=##VERSION## ngcpcrole=mgmt ngcphostname=web01a 
+  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/netscript/##VERSION##/deployment.sh ngcpsp1 ngcpnw.dhcp ngcpnonwrecfg ngcpvers=##VERSION## ngcpcrole=mgmt ngcphostname=web01a 

  text help
                                     Install sip:Carrier version ##VERSION##.
@ -15,7 +15,7 @@ label carrier##VERSION##
 label carriernw##VERSION##
  menu label sip:Carrier mgmt/web01a / ##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 ngcppro ssh=sipwise debianrelease=##DIST## netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ngcpnoupload ngcpvers=##VERSION## dns=92.42.136.30 ngcpnonwrecfg ngcpcrole=mgmt ngcphostname=web01a 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/netscript/##VERSION##/deployment.sh ngcpsp1 ngcpnoupload ngcpvers=##VERSION## dns=92.42.136.30 ngcpnonwrecfg ngcpcrole=mgmt ngcphostname=web01a ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off 

  text help
                                     Install sip:Carrier version ##VERSION##.
--- 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 ngcpnw.dhcp 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/netscript/##VERSION##/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 ngcpvers=##VERSION## ip=10.15.20.123::10.15.20.1:255.255.255.0:spce:eth0:off dns=8.8.8.8 
+  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/netscript/##VERSION##/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,
--- 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 ngcpnw.dhcp 
+  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,
@ -13,7 +13,7 @@ label ce##VERSION##
 label cenw##VERSION##
  menu label Install ##VERSION## sip:providerCE - static NW
  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 ip=192.168.1.100::192.168.1.1:255.255.255.0:spce:eth0:off dns=8.8.8.8 
+  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 ip=192.168.1.100::192.168.1.1:255.255.255.0:spce:eth0:off dns=8.8.8.8 

  text help
                                     Install sip:provider community edition,
--- 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=8.8.8.8 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/netscript/##VERSION##/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=8.8.8.8 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/netscript/##VERSION##/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
@ -27,7 +27,7 @@ label prosp2nw-##VERSION##
 label prosp1-##VERSION##
  menu label sip:providerPRO - sp1 DHCP/ ##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## ngcpnw.dhcp 
+  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/netscript/##VERSION##/deployment.sh ngcpsp1 ngcpvers=##VERSION## ngcpnw.dhcp 

  text help
                                     Install sip:provider
@ -39,7 +39,7 @@ label prosp1-##VERSION##
 label prosp2-##VERSION##
  menu label sip:providerPRO - sp2 DHCP/ ##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## ngcpnw.dhcp 
+  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/netscript/##VERSION##/deployment.sh ngcpsp2 ngcpvers=##VERSION## ngcpnw.dhcp 

  text help
                                     Install sip:provider
--- a/templates-ce/scripts/includes/deployment.sh
+++ b/templates-ce/scripts/includes/deployment.sh
--- a/templates-ce/scripts/main.sh
+++ b/templates-ce/scripts/main.sh
@ -7,6 +7,7 @@ export LC_ALL=C

 working_dir="$(dirname $0)"
 scripts_dir="${working_dir}/includes/"
+netscript_dir="${scripts_dir}/netscript/"

 RC=0

@ -128,8 +129,17 @@ deploy() {
    return 0
  fi

+  # choose appropriate deployment.sh script:
+  local version=$(grep -Eo '\<ngcpvers=[^ ]+' /proc/cmdline || true)
+  if [ "$version" ]; then
+    version=${version#*=}
+  else
+    version="master"
+  fi
+
+  einfo "Running ${YELLOW}${version}${NORMAL} of deployment.sh..."; eend 0
  RC=0
-  TARGET_DISK=$TARGET_DISK ${scripts_dir}/deployment.sh || RC=$?
+  TARGET_DISK=$TARGET_DISK /bin/bash ${netscript_dir}/${version}/deployment.sh || RC=$?
  if [ $RC -eq 0 ] ; then
    if dialog --yes-label Reboot --no-label Exit --yesno "Successfully finished deployment, enjoy your sip:provider CE system. Reboot system now?" 0 0 ; then
      reboot
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@ -12,42 +12,42 @@ 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 ngcpnw.dhcp 
+  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/netscript/master/deployment.sh ngcphostname=spce ngcpnw.dhcp 
  echo 'Loading initrd...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }

 menuentry "Install sip:providerCE  - static NW config" {
  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 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=wheezy netscript=http://deb.sipwise.com/netscript/master/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...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }

 menuentry "Install sip:providerPRO - sp1" {
  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 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=wheezy netscript=http://deb.sipwise.com/netscript/master/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...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }

 menuentry "Install sip:providerPRO - sp2" {
  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 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=wheezy netscript=http://deb.sipwise.com/netscript/master/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...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }

 menuentry "Install sip:providerPRO - sp1 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 ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ngcpnw.dhcp 
+  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/netscript/master/deployment.sh ngcpsp1 ngcpnw.dhcp 
  echo 'Loading initrd...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }

 menuentry "Install sip:providerPRO - sp2 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 ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ngcpnw.dhcp 
+  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/netscript/master/deployment.sh ngcpsp2 ngcpnw.dhcp 
  echo 'Loading initrd...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }
@ -57,42 +57,42 @@ 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 
+  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/netscript/master/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 
+  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/netscript/master/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 
+  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/netscript/master/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 
+  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/netscript/master/deployment.sh 
  echo 'Loading initrd...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }

 menuentry "Install Debian/squeeze 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=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 
+  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/netscript/master/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/squeeze 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=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 
+  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/netscript/master/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
 }
@ -102,14 +102,14 @@ 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 ngcpnw.dhcp 
+  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/netscript/master/deployment.sh ngcphostname=spce ngcptrunk ngcpnoupload ngcpnw.dhcp 
  echo 'Loading initrd...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }

 menuentry "sip:providerCE (static NW) - 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 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=wheezy netscript=http://deb.sipwise.com/netscript/master/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...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }
@ -123,28 +123,28 @@ submenu "Specific sip:providerPRO releases ... ->" --class=submenu {

 menuentry "sip:providerPRO - sp1 / trunk 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=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 
+  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/netscript/master/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...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }

 menuentry "sip:providerPRO - sp2 / trunk 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=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 
+  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/netscript/master/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...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }

 menuentry "sip:providerPRO - sp1 DHCP/ trunk 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=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ngcptrunk ngcpnoupload  ngcpnw.dhcp 
+  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/netscript/master/deployment.sh ngcpsp1 ngcptrunk ngcpnoupload  ngcpnw.dhcp 
  echo 'Loading initrd...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }

 menuentry "sip:providerPRO - sp2 DHCP/ trunk 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=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ngcptrunk ngcpnoupload ngcpnw.dhcp 
+  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/netscript/master/deployment.sh ngcpsp2 ngcptrunk ngcpnoupload ngcpnw.dhcp 
  echo 'Loading initrd...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }
@ -158,14 +158,14 @@ submenu "Specific sip:Carrier releases ... ->" --class=submenu {

 menuentry "sip:Carrier mgmt (web01a) DHCP / trunk" {
  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 ngcpnoupload ngcpnw.dhcp ngcptrunk ngcpcrole=mgmt ngcpnonwrecfg ngcphostname=web01a 
+  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/netscript/master/deployment.sh ngcpsp1 ngcpnoupload ngcpnw.dhcp ngcptrunk ngcpcrole=mgmt ngcpnonwrecfg ngcphostname=web01a 
  echo 'Loading initrd...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }

 menuentry "sip:Carrier mgmt (web01a) / trunk" {
  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 ngcpnoupload ngcpnonwrecfg dns=92.42.136.30 ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off ngcptrunk ngcpcrole=mgmt ngcphostname=web01a 
+  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/netscript/master/deployment.sh ngcpsp1 ngcpnoupload ngcpnonwrecfg dns=92.42.136.30 ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off ngcptrunk ngcpcrole=mgmt ngcphostname=web01a 
  echo 'Loading initrd...'
  initrd /boot/%SHORT_NAME%/initrd.img
 }
--- a/templates/boot/isolinux/isolinux.cfg
+++ b/templates/boot/isolinux/isolinux.cfg
@ -52,7 +52,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 ngcpnw.dhcp 
+  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/netscript/master/deployment.sh ngcphostname=spce ngcpnw.dhcp 

  text help
                                     Install sip:provider community edition.
@ -63,7 +63,7 @@ label ce
 label cenw
  menu label Install sip:providerCE  - static NW config
  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 dns=92.42.136.30 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=wheezy netscript=http://deb.sipwise.com/netscript/master/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 

  text help
                                     Install sip:provider community edition.
@ -76,7 +76,7 @@ label cenw
 label prosp1nw
  menu label Install sip:providerPRO - sp1
  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 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=wheezy netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 dns=92.42.136.30 ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off 

  text help
                                     Install sip:provider professional edition.
@ -90,7 +90,7 @@ label prosp1nw
 label prosp2nw
  menu label Install sip:providerPRO - sp2
  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 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=wheezy netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp2 dns=92.42.136.30 ip=10.15.20.102::10.15.20.1:255.255.255.0:sp2:eth0:off 

  text help
                                     Install sip:provider professional edition.
@ -104,7 +104,7 @@ label prosp2nw
 label prosp1
  menu label Install sip:providerPRO - sp1 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 
+  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/netscript/master/deployment.sh ngcpsp1 ngcpnw.dhcp 

  text help
                                     Install sip:provider professional edition.
@ -117,7 +117,7 @@ label prosp1
 label prosp2
  menu label Install sip:providerPRO - sp2 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 
+  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/netscript/master/deployment.sh ngcpsp2 ngcpnw.dhcp 

  text help
                                     Install sip:provider professional edition.
@ -141,7 +141,7 @@ menu separator
 label wheezy
  menu label Install Debian/wheezy  64bit - 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 nongcp ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh 
+  append initrd=/boot/%SHORT_NAME%/initrd.img 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/netscript/master/deployment.sh 

  text help
                                     Install Debian wheezy, 64bit.
@ -154,7 +154,7 @@ label wheezy
 label wheezynw
  menu label Install Debian/wheezy  64bit - static NW
  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 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 
+  append initrd=/boot/%SHORT_NAME%/initrd.img 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/netscript/master/deployment.sh dns=92.42.136.30 ip=10.15.20.123::10.15.20.1:255.255.255.0:debian:eth0:off 

  text help
                                     Install Debian wheezy, 64bit.
@ -167,7 +167,7 @@ label wheezynw
 label wheezypuppet
  menu label Install Debian/wheezy  64bit - Puppet
  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 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 
+  append initrd=/boot/%SHORT_NAME%/initrd.img 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/netscript/master/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 

  text help
                                     Install Debian wheezy, 64bit using
@ -182,7 +182,7 @@ label wheezypuppet
 label squeeze
  menu label Install Debian/squeeze 64bit - 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 nongcp ssh=sipwise debianrelease=squeeze netscript=http://deb.sipwise.com/kantan/deployment.sh 
+  append initrd=/boot/%SHORT_NAME%/initrd.img 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/netscript/master/deployment.sh 

  text help
                                     Install Debian squeeze, 64bit.
@ -195,7 +195,7 @@ label squeeze
 label squeezenw
  menu label Install Debian/squeeze 64bit - static NW
  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 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 
+  append initrd=/boot/%SHORT_NAME%/initrd.img 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/netscript/master/deployment.sh dns=92.42.136.30 ip=10.15.20.123::10.15.20.1:255.255.255.0:debian:eth0:off 

  text help
                                     Install Debian squeeze, 64bit.
@ -208,7 +208,7 @@ label squeezenw
 label squeezepuppet
  menu label Install Debian/squeeze 64bit - Puppet
  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 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 
+  append initrd=/boot/%SHORT_NAME%/initrd.img 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/netscript/master/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 

  text help
                                     Install Debian squeeze, 64bit using
@ -247,7 +247,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 ngcpnw.dhcp 
+  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/netscript/master/deployment.sh ngcphostname=spce ngcptrunk ngcpnoupload ngcpnw.dhcp 

  text help
                                     Install sip:provider community edition,
@ -259,7 +259,7 @@ label cetrunk
 label cenwtrunk
  menu label sip:providerCE (static NW) - 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 dns=92.42.136.30 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=wheezy netscript=http://deb.sipwise.com/netscript/master/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
                                     Install sip:provider community edition,
@ -291,7 +291,7 @@ menu separator
 label prosp1nw-trunk
  menu label sip:providerPRO - sp1 / trunk 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=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 
+  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/netscript/master/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
                                     Install sip:provider
@ -304,7 +304,7 @@ label prosp1nw-trunk
 label prosp2nw-trunk
  menu label sip:providerPRO - sp2 / trunk 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=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 
+  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/netscript/master/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
                                     Install sip:provider
@ -317,7 +317,7 @@ label prosp2nw-trunk
 label prosp1-trunk
  menu label sip:providerPRO - sp1 DHCP/ trunk 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=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ngcptrunk ngcpnoupload ngcpnw.dhcp 
+  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/netscript/master/deployment.sh ngcpsp1 ngcptrunk ngcpnoupload ngcpnw.dhcp 

  text help
                                     Install sip:provider
@ -329,7 +329,7 @@ label prosp1-trunk
 label prosp2-trunk
  menu label sip:providerPRO - sp2 DHCP/ trunk 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=wheezy netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ngcptrunk ngcpnoupload ngcpnw.dhcp 
+  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/netscript/master/deployment.sh ngcpsp2 ngcptrunk ngcpnoupload ngcpnw.dhcp 

  text help
                                     Install sip:provider
@ -360,7 +360,7 @@ menu separator
 label carrierweb01atrunkdhcp
  menu label sip:Carrier mgmt/web01a DHCP / trunk
  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 ngcptrunk ngcpnw.dhcp ngcpnonwrecfg ngcpcrole=mgmt ngcphostname=web01a 
+  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/netscript/master/deployment.sh ngcpsp1 ngcptrunk ngcpnw.dhcp ngcpnonwrecfg ngcpcrole=mgmt ngcphostname=web01a 

  text help
                                     Install sip:Carrier edition (trunk).
@ -374,7 +374,7 @@ label carrierweb01atrunkdhcp
 label carrierweb01atrunkstatic
  menu label sip:Carrier mgmt/web01a / trunk
  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 ngcptrunk ngcpnoupload ngcpnonwrecfg dns=92.42.136.30 ngcpcrole=mgmt ngcphostname=web01a 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=wheezy netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 ngcptrunk ngcpnoupload ngcpnonwrecfg dns=92.42.136.30 ngcpcrole=mgmt ngcphostname=web01a ip=10.15.20.101::10.15.20.1:255.255.255.0:sp1:eth0:off

  text help
                                     Install sip:Carrier edition (trunk).