From c53fdd6efcf3c64b32dee1c22cab752921b9c201 Mon Sep 17 00:00:00 2001 From: Alexander Lutay Date: Tue, 18 Jun 2019 14:09:40 +0200 Subject: [PATCH] TT#60950 Switch deployment-iso.git from stretch to buster Change-Id: I60393c821bab0b0715654349d57304ee0fbe0794 --- build_iso.sh | 2 +- build_templates.sh | 2 +- grub.cfg | 10 +++++----- isolinux.cfg | 18 +++++++++--------- templates/scripts/includes/deployment.sh | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build_iso.sh b/build_iso.sh index 2ee3921..d40cd64 100755 --- a/build_iso.sh +++ b/build_iso.sh @@ -19,7 +19,7 @@ SIPWISE_ISO="sip_provider_${MR}_${DATE}.iso" usage () { echo "Usage: $0 compat " - echo "Sample: $0 compat 'grml64-full_2014.11.iso' mr6.2.1 stretch" + echo "Sample: $0 compat 'grml64-full_2014.11.iso' mr6.2.1 buster" exit 1 } diff --git a/build_templates.sh b/build_templates.sh index 43c5da9..496711f 100755 --- a/build_templates.sh +++ b/build_templates.sh @@ -5,7 +5,7 @@ BASE="$(dirname "$0")" TEMPLATES="${TEMPLATES:-templates}" BOOT="${BASE}/${TEMPLATES}/boot" MR="${MR:-trunk}" -DIST="${DIST:-stretch}" +DIST="${DIST:-buster}" echo "*** grub templates for RELEASE:${MR} DIST:${DIST} ***" diff --git a/grub.cfg b/grub.cfg index 58c82d5..75c53bb 100644 --- a/grub.cfg +++ b/grub.cfg @@ -39,18 +39,18 @@ menuentry "##VERSION## Sipwise C5 CARRIER (web01a)" { } ## submenus -submenu "Install Debian stretch ... ->" --class=submenu { +submenu "Install Debian buster ... ->" --class=submenu { -menuentry "Install Debian/stretch 64bit" { +menuentry "Install Debian/buster 64bit" { 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 net.ifnames=0 nongcp ssh=sipwise debianrelease=stretch scripts + 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 net.ifnames=0 nongcp ssh=sipwise debianrelease=buster scripts echo 'Loading initrd...' initrd /boot/%SHORT_NAME%/initrd.img } -menuentry "Install Debian/stretch 64bit - Puppet" { +menuentry "Install Debian/buster 64bit - Puppet" { 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 net.ifnames=0 nongcp ssh=sipwise debianrelease=stretch scripts puppetenv=production dns=1.1.1.1,8.8.8.8 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 mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=buster scripts puppetenv=production dns=1.1.1.1,8.8.8.8 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 } diff --git a/isolinux.cfg b/isolinux.cfg index 8a4ddba..47f06b7 100644 --- a/isolinux.cfg +++ b/isolinux.cfg @@ -102,30 +102,30 @@ label carrier##VERSION## menu separator menu begin debian-options -menu title Install Debian stretch ... +menu title Install Debian buster ... label mainmenu menu label ^Back to main menu... menu exit menu separator -label stretch - menu label Install Debian/stretch 64bit +label buster + menu label Install Debian/buster 64bit 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 net.ifnames=0 nongcp ssh=sipwise debianrelease=stretch scripts + 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 net.ifnames=0 nongcp ssh=sipwise debianrelease=buster scripts text help - Install Debian stretch, 64bit. + Install Debian buster, 64bit. Does NOT install Sipwise C5 platform. endtext -label stretchpuppet - menu label Install Debian/stretch 64bit - Puppet +label busterpuppet + menu label Install Debian/buster 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 mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=stretch scripts puppetenv=production dns=1.1.1.1,8.8.8.8 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 mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 nongcp ssh=sipwise debianrelease=buster scripts puppetenv=production dns=1.1.1.1,8.8.8.8 ip=10.15.20.123::10.15.20.1:255.255.255.0:puppet-client42:eth0:off text help - Install Debian stretch, 64bit using + Install Debian buster, 64bit using integration in Puppet configuration management environment. Does NOT install Sipwise C5 platform. diff --git a/templates/scripts/includes/deployment.sh b/templates/scripts/includes/deployment.sh index 7e60c5d..5c9da17 100755 --- a/templates/scripts/includes/deployment.sh +++ b/templates/scripts/includes/deployment.sh @@ -55,7 +55,7 @@ DHCP=false LOGO=true RETRIEVE_MGMT_CONFIG=false TRUNK_VERSION=false -DEBIAN_RELEASE=stretch +DEBIAN_RELEASE=buster HALT=false REBOOT=false STATUS_DIRECTORY=/srv/deployment/