From 71434f492bb551ea19f8327645d101f96abd717a Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 17 Jan 2017 15:31:34 +0100 Subject: [PATCH] TT#9084 Default to Debian/jessie nowadays We shouldn't install wheezy systems with "Install sip:providerCE" amd "Install sip:providerPRO" entries. Change-Id: Ia78787c2bb997be55c86d7206c1c2723d4f36b63 --- templates/boot/grub/grub.cfg | 12 ++++++------ templates/boot/isolinux/isolinux.cfg | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg index 7261cdc..c1e9df7 100644 --- 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 mgag200.modeset=0 vga=791 quiet nomce ngcpce ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcphostname=spce ngcpnw.dhcp + linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce ngcpce ssh=sipwise debianrelease=jessie 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 mgag200.modeset=0 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,92.42.136.31 nodhcp 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 mgag200.modeset=0 vga=791 quiet nomce ngcpce ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcphostname=spce dns=92.42.136.30,92.42.136.31 nodhcp 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 mgag200.modeset=0 vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 dns=92.42.136.30,92.42.136.31 nodhcp 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 mgag200.modeset=0 vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 dns=92.42.136.30,92.42.136.31 nodhcp 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 mgag200.modeset=0 vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp2 dns=92.42.136.30,92.42.136.31 nodhcp 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 mgag200.modeset=0 vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp2 dns=92.42.136.30,92.42.136.31 nodhcp 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 mgag200.modeset=0 vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 ngcpnw.dhcp + linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=jessie 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 mgag200.modeset=0 vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp2 ngcpnw.dhcp + linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp2 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 bd4d786..4750ef0 100644 --- 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 mgag200.modeset=0 vga=791 quiet nomce ngcpce ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/netscript/master/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 mgag200.modeset=0 vga=791 quiet nomce ngcpce ssh=sipwise debianrelease=jessie 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 mgag200.modeset=0 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,92.42.136.31 nodhcp 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 mgag200.modeset=0 vga=791 quiet nomce ngcpce ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcphostname=spce dns=92.42.136.30,92.42.136.31 nodhcp 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 mgag200.modeset=0 vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 dns=92.42.136.30,92.42.136.31 nodhcp 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 mgag200.modeset=0 vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp1 dns=92.42.136.30,92.42.136.31 nodhcp 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 mgag200.modeset=0 vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp2 dns=92.42.136.30,92.42.136.31 nodhcp 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 mgag200.modeset=0 vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp2 dns=92.42.136.30,92.42.136.31 nodhcp 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 mgag200.modeset=0 vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/netscript/master/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 mgag200.modeset=0 vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=jessie 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 mgag200.modeset=0 vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=wheezy netscript=http://deb.sipwise.com/netscript/master/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 mgag200.modeset=0 vga=791 quiet nomce ngcppro ssh=sipwise debianrelease=jessie netscript=http://deb.sipwise.com/netscript/master/deployment.sh ngcpsp2 ngcpnw.dhcp text help Install sip:provider professional edition.