diff --git a/templates/boot/isolinux/default.cfg b/templates/boot/isolinux/default.cfg
index 6f91f33..7bb7c3f 100644
--- a/templates/boot/isolinux/default.cfg
+++ b/templates/boot/isolinux/default.cfg
@@ -3,7 +3,7 @@ label grml
menu DEFAULT
menu label Rescue system boot (%VERSION%, %ARCH%)
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick ssh=grml
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce noquick ssh=sipwise
text help
Automatic deployment system for the
Sipwise Next Generation Communication
@@ -15,7 +15,7 @@ label grml
label ce
menu label Install sip:providerCE - DHCP
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce
text help
Install sip:provider
@@ -27,7 +27,7 @@ label ce
label cenw
menu label Install sip:providerCE - static NW config
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ip=192.168.51.123::192.168.51.1:255.255.255.0:spce:eth0:off dns=192.168.51.2
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ip=192.168.51.123::192.168.51.1:255.255.255.0:spce:eth0:off dns=192.168.51.2
text help
Install sip:provider
@@ -40,7 +40,7 @@ label cenw
label prosp1nw
menu label Install sip:providerPRO - sp1
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=195.58.160.194
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=195.58.160.194
text help
Install sip:provider
@@ -54,7 +54,7 @@ label prosp1nw
label prosp2nw
menu label Install sip:providerPRO - sp2
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=195.58.160.194
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=195.58.160.194
text help
Install sip:provider
@@ -67,7 +67,7 @@ label prosp2nw
label squeeze
menu label Install Debian/squeeze 64bit - DHCP
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce nongcp ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce nongcp ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh
text help
Install Debian squeeze, 64bit.
@@ -81,7 +81,7 @@ label squeeze
label squeezenw
menu label Install Debian/squeeze 64bit - static NW
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce nongcp ssh=grml 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=192.168.51.2
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce nongcp ssh=sipwise 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=192.168.51.2
text help
Install Debian squeeze, 64bit.
@@ -110,7 +110,7 @@ menu separator
label cetrunk
menu label sip:providerCE (DHCP) - trunk version
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcptrunk
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcptrunk
text help
Install sip:provider
@@ -122,7 +122,7 @@ label cetrunk
label cenwtrunk
menu label sip:providerCE (static NW) - trunk version
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ip=192.168.51.123::192.168.51.1:255.255.255.0:spce:eth0:off dns=192.168.51.2 ngcptrunk
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ip=192.168.51.123::192.168.51.1:255.255.255.0:spce:eth0:off dns=192.168.51.2 ngcptrunk
text help
Install sip:provider
@@ -134,7 +134,7 @@ label cenwtrunk
label ce2.4
menu label sip:providerCE (DHCP) - version 2.4
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpvers=2.4
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpvers=2.4
text help
Install sip:provider
@@ -146,7 +146,7 @@ label ce2.4
label cenw2.4
menu label sip:providerCE (static NW) - version 2.4
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ip=192.168.51.123::192.168.51.1:255.255.255.0:spce:eth0:off dns=192.168.51.2 ngcpvers=2.4
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ip=192.168.51.123::192.168.51.1:255.255.255.0:spce:eth0:off dns=192.168.51.2 ngcpvers=2.4
text help
Install sip:provider
@@ -158,7 +158,7 @@ label cenw2.4
label ce2.2
menu label sip:providerCE (DHCP) - version 2.2
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpvers=2.2
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpvers=2.2
text help
Install sip:provider
@@ -170,7 +170,7 @@ label ce2.2
label cenw2.2
menu label sip:providerCE (static NW) - version 2.2
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ip=192.168.51.123::192.168.51.1:255.255.255.0:spce:eth0:off dns=192.168.51.2 ngcpvers=2.2
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ip=192.168.51.123::192.168.51.1:255.255.255.0:spce:eth0:off dns=192.168.51.2 ngcpvers=2.2
text help
Install sip:provider
@@ -182,7 +182,7 @@ label cenw2.2
label ce2.1
menu label sip:providerCE (DHCP) - version 2.1
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpvers=2.1
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ngcpvers=2.1
text help
Install sip:provider
@@ -194,7 +194,7 @@ label ce2.1
label cenw2.1
menu label sip:providerCE (static NW) - version 2.1
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ip=192.168.51.123::192.168.51.1:255.255.255.0:spce:eth0:off dns=192.168.51.2 ngcpvers=2.1
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcpce ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcphostname=spce ip=192.168.51.123::192.168.51.1:255.255.255.0:spce:eth0:off dns=192.168.51.2 ngcpvers=2.1
text help
Install sip:provider
@@ -223,7 +223,7 @@ menu separator
label prosp1nw-trunk
menu label sip:providerPRO - sp1 / trunk release
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=195.58.160.194 ngcptrunk
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=195.58.160.194 ngcptrunk
text help
Install sip:provider
@@ -236,7 +236,7 @@ label prosp1nw-trunk
label prosp2nw-trunk
menu label sip:providerPRO - sp2 / trunk release
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=195.58.160.194 ngcptrunk
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=195.58.160.194 ngcptrunk
text help
Install sip:provider
@@ -249,7 +249,7 @@ label prosp2nw-trunk
label prosp1nw-2.4
menu label sip:providerPRO - sp1 / 2.4 release
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=195.58.160.194 ngcpvers=2.4
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=195.58.160.194 ngcpvers=2.4
text help
Install sip:provider
@@ -262,7 +262,7 @@ label prosp1nw-2.4
label prosp2nw-2.4
menu label sip:providerPRO - sp2 / 2.4 release
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=195.58.160.194 ngcpvers=2.4
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=195.58.160.194 ngcpvers=2.4
text help
Install sip:provider
@@ -275,7 +275,7 @@ label prosp2nw-2.4
label prosp1nw-2.3
menu label sip:providerPRO - sp1 / 2.3 release
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=195.58.160.194 ngcpvers=2.3
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=195.58.160.194 ngcpvers=2.3
text help
Install sip:provider
@@ -288,7 +288,7 @@ label prosp1nw-2.3
label prosp2nw-2.3
menu label sip:providerPRO - sp2 / 2.3 release
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=195.58.160.194 ngcpvers=2.3
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=195.58.160.194 ngcpvers=2.3
text help
Install sip:provider
@@ -301,7 +301,7 @@ label prosp2nw-2.3
label prosp1nw-2.2
menu label sip:providerPRO - sp1 / 2.2 release
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=195.58.160.194 ngcpvers=2.2
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp1 ip=192.168.1.101::192.168.1.1:255.255.255.0:sp1:eth0:off dns=195.58.160.194 ngcpvers=2.2
text help
Install sip:provider
@@ -314,7 +314,7 @@ label prosp1nw-2.2
label prosp2nw-2.2
menu label sip:providerPRO - sp2 / 2.2 release
kernel /boot/%SHORT_NAME%/linux26
- append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=grml netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=195.58.160.194 ngcpvers=2.2
+ append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off vga=791 quiet nomce ngcppro ssh=sipwise netscript=http://deb.sipwise.com/kantan/deployment.sh ngcpsp2 ip=192.168.1.102::192.168.1.1:255.255.255.0:sp2:eth0:off dns=195.58.160.194 ngcpvers=2.2
text help
Install sip:provider