From 9506ba5c75a7baaefed8611bae9412734bf73e99 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 23 Dec 2020 14:36:33 +0100 Subject: [PATCH] Use bullseye as default Debian release We want to use Debian/bullseye as default release within the grml-debootstrap version that's going to be shipped with bullseye, so let's be prepared for this. FTR: *not* modifying the Travis CI related configuration files with this change, as the unstable builds on Travis CI are known to be unreliable. Travis CI also seems to be a dead end for us, so it's not worth putting any further efforts into it, at least for the time being. --- config | 4 ++-- grml-debootstrap | 8 ++++---- grml-debootstrap.8.txt | 18 +++++++++--------- packer/debian64.json | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/config b/config index 6477acf..b5104f0 100644 --- a/config +++ b/config @@ -73,8 +73,8 @@ # Debian release that should be installed. # Supported values: lenny, squeeze, wheezy, jessie, stretch, buster, bullseye, sid -# Default: 'buster' -# RELEASE='buster' +# Default: 'bullseye' +# RELEASE='bullseye' # Define components that should be used within sources.list. # Default: 'main' diff --git a/grml-debootstrap b/grml-debootstrap index ae601f8..97b1927 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -72,7 +72,7 @@ MNTPOINT="/mnt/debootstrap.$$" [ -n "$POST_SCRIPTS" ] || POST_SCRIPTS='yes' [ -n "$PRE_SCRIPTS" ] || PRE_SCRIPTS='yes' [ -n "$RECONFIGURE" ] || RECONFIGURE='console-data' -[ -n "$RELEASE" ] || RELEASE='buster' +[ -n "$RELEASE" ] || RELEASE='bullseye' [ -n "$RM_APTCACHE" ] || RM_APTCACHE='yes' [ -n "$SCRIPTS" ] || SCRIPTS='no' # deprecated, replaced by POST_SCRIPTS [ -n "$SECURE" ] || SECURE='yes' @@ -103,7 +103,7 @@ Bootstrap options: -m, --mirror Mirror which should be used for apt-get/aptitude. -i, --iso Mountpoint where a Debian ISO is mounted to, for use instead of fetching packages from a mirror. - -r, --release Release of new Debian system (default: buster). + -r, --release Release of new Debian system (default: bullseye). -t, --target Target partition (/dev/...) or directory where the system should be installed to. -p, --mntpoint Mountpoint used for mounting the target system, @@ -779,7 +779,7 @@ prompt_for_bootmanager() # ask for Debian release {{{ prompt_for_release() { - [ -n "$RELEASE" ] && DEFAULT_RELEASE="$RELEASE" || DEFAULT_RELEASE='buster' + [ -n "$RELEASE" ] && DEFAULT_RELEASE="$RELEASE" || DEFAULT_RELEASE='bullseye' RELEASE="$(dialog --stdout --title "${PN}" --default-item $DEFAULT_RELEASE --menu \ "Please enter the Debian release you would like to use for installation:" \ 0 50 8 \ @@ -1162,7 +1162,7 @@ fi # Support for generic release codenames is unavailable. {{{ if [ "$RELEASE" = "stable" ] || [ "$RELEASE" = "testing" ] ; then eerror "Generic release codenames (stable, testing) are unsupported. \ -Please use specific codenames such as stretch or buster." ; eend 1 +Please use specific codenames such as buster or bullseye." ; eend 1 bailout 1 fi # }}} diff --git a/grml-debootstrap.8.txt b/grml-debootstrap.8.txt index 111ca97..b572f5c 100644 --- a/grml-debootstrap.8.txt +++ b/grml-debootstrap.8.txt @@ -219,7 +219,7 @@ Options and environment variables Specify release of new Debian system. Supported releases names: lenny, squeeze, wheezy, jessie, stretch, buster, bullseye and sid. Corresponding with configuration - variable RELEASE. Default release: buster + variable RELEASE. Default release: bullseye *--remove-configs*:: @@ -294,7 +294,7 @@ Usage examples grml-debootstrap --target /dev/sda1 --grub /dev/sda -Install default Debian release (buster) on /dev/sda1 and install bootmanager GRUB in MBR (master boot record) of /dev/sda. +Install default Debian release (bullseye) on /dev/sda1 and install bootmanager GRUB in MBR (master boot record) of /dev/sda. grml-debootstrap --release stretch --target /dev/sda1 --grub /dev/sda --hostname debian01 --password changeme @@ -307,32 +307,32 @@ Install Debian unstable/sid on /dev/sda6 and install bootmanager GRUB in MBR (ma DEBOOTSTRAP=mmdebstrap grml-debootstrap --target /dev/sda1 --grub /dev/sda -Install default Debian release (buster) on /dev/sda1 and install bootmanager GRUB in MBR (master boot record) of /dev/sda. +Install default Debian release (bullseye) on /dev/sda1 and install bootmanager GRUB in MBR (master boot record) of /dev/sda. Use mmdebstrap instead of default debootstrap tool for bootstrapping. grml-debootstrap --target /dev/mapper/vg0-rootfs --grub /dev/sda -Install default Debian release (buster) on LVM device /dev/mapper/vg0-rootfs and install bootmanager GRUB in MBR (master boot record) of /dev/sda. +Install default Debian release (bullseye) on LVM device /dev/mapper/vg0-rootfs and install bootmanager GRUB in MBR (master boot record) of /dev/sda. grml-debootstrap --efi /dev/sda1 --target /dev/sda2 --grub /dev/sda -Install default Debian release (buster) on /dev/sda2 and install bootmanager GRUB in MBR (master boot record) of /dev/sda. +Install default Debian release (bullseye) on /dev/sda2 and install bootmanager GRUB in MBR (master boot record) of /dev/sda. Use /dev/sda1 as EFI partition (requires EFI support in booted system). mount /dev/sda1 /data/chroot grml-debootstrap --target /data/chroot -Install default Debian release (buster) in directory /data/chroot (without any bootloader). +Install default Debian release (bullseye) in directory /data/chroot (without any bootloader). grml-debootstrap --target /dev/sda3 --grub /dev/sda --mirror ftp://ftp.tugraz.at/mirror/debian -Install default Debian release (buster) on /dev/sda3 and install bootmanager GRUB in MBR (master boot record) of /dev/sda. +Install default Debian release (bullseye) on /dev/sda3 and install bootmanager GRUB in MBR (master boot record) of /dev/sda. Use specified mirror instead of the default (http://deb.debian.org/debian) one. mount /dev/sda1 /mnt/sda1 grml-debootstrap --vmfile --vmsize 3G --target /mnt/sda1/qemu.img -Install default debian release (buster) in a Virtual Machine file with 3GB disk size (including GRUB as bootmanager in MBR of the virtual disk file): +Install default debian release (bullseye) in a Virtual Machine file with 3GB disk size (including GRUB as bootmanager in MBR of the virtual disk file): mount -o loop ./debian-CD-1.iso /media/cdrom grml-debootstrap --target /dev/sda1 --grub /dev/sda --iso /media/cdrom @@ -404,7 +404,7 @@ Where do you want to install grub to? Usage example: grub=/dev/sda release=... -Specify release of new Debian system. Defaults to Debian buster. Supported +Specify release of new Debian system. Defaults to Debian bullseye. Supported releases: lenny, squeeze, wheezy, jessie, stretch, buster, bullseye and sid. Usage example: release=stretch mirror=... diff --git a/packer/debian64.json b/packer/debian64.json index 9337cfb..d1c2595 100644 --- a/packer/debian64.json +++ b/packer/debian64.json @@ -71,7 +71,7 @@ } ], "variables": { - "debian_version": "buster", + "debian_version": "bullseye", "grml_debootstrap_local_path": "doesnotexist", "grml_debootstrap_version": "latest", "grml_iso_checksum": "80ccb1bc1eb6116e9094a332d58a3715f2160ab1", -- 2.1.4