From 070010f3b89fedea00ca8da305efeaf5ee5692b4 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Sun, 30 Dec 2018 11:27:25 +0100
Subject: [PATCH] Add preliminary support for Debian/bullseye (AKA Debian
 v11.0)

The "bullseye" release doesn't exist on the Debian repositories
as such yet, though it's supposed to appear at least once buster
(AKA Debian v10.0) is stable.
---
 config                 | 2 +-
 grml-debootstrap       | 3 ++-
 grml-debootstrap.8.txt | 4 ++--
 packer/Makefile        | 6 +++++-
 releasetable-man.txt   | 4 +++-
 releasetable.txt       | 1 +
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/config b/config
index e329353..413e31f 100644
--- a/config
+++ b/config
@@ -72,7 +72,7 @@
 # BACKPORTREPOS='yes'
 
 # Debian release that should be installed.
-# Supported values: lenny, squeeze, wheezy, jessie, stretch, buster, sid
+# Supported values: lenny, squeeze, wheezy, jessie, stretch, buster, bullseye, sid
 # Default: 'buster'
 # RELEASE='buster'
 
diff --git a/grml-debootstrap b/grml-debootstrap
index 32085c1..accef96 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -762,13 +762,14 @@ prompt_for_release()
   [ -n "$RELEASE" ] && DEFAULT_RELEASE="$RELEASE" || DEFAULT_RELEASE='buster'
   RELEASE="$(dialog --stdout --title "${PN}" --default-item $DEFAULT_RELEASE --menu \
             "Please enter the Debian release you would like to use for installation:" \
-            0 50 6 \
+            0 50 8 \
             lenny    Debian/5.0 \
             squeeze  Debian/6.0 \
             wheezy   Debian/7.0 \
             jessie   Debian/8.0 \
             stretch  Debian/9.0 \
             buster   Debian/10.0 \
+            bullseye Debian/11.0 \
             sid      Debian/unstable)"
   [ $? -eq 0 ] || bailout
 }
diff --git a/grml-debootstrap.8.txt b/grml-debootstrap.8.txt
index 7d18815..4882d2b 100644
--- a/grml-debootstrap.8.txt
+++ b/grml-debootstrap.8.txt
@@ -216,7 +216,7 @@ Options and environment variables
 *-r*, *--release* _releasename_::
 
     Specify release of new Debian system. Supported releases names: lenny,
-    squeeze, wheezy, jessie, stretch, buster and sid. Corresponding with configuration
+    squeeze, wheezy, jessie, stretch, buster, bullseye and sid. Corresponding with configuration
     variable RELEASE. Default release: buster
 
 *--remove-configs*::
@@ -375,7 +375,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
-releases: lenny, squeeze, wheezy, jessie, stretch, buster and sid. Usage example: release=stretch
+releases: lenny, squeeze, wheezy, jessie, stretch, buster, bullseye and sid. Usage example: release=stretch
 
   mirror=...
 
diff --git a/packer/Makefile b/packer/Makefile
index 0d8e104..6a94be0 100644
--- a/packer/Makefile
+++ b/packer/Makefile
@@ -12,6 +12,10 @@ clean:
 fake-uname.so:
 	gcc -shared -fPIC -ldl fake-uname.c -o fake-uname.so
 
+# Debian 11
+bullseye: fake-uname.so clean install
+	packer build -var debian_version=$@ -var grml_debootstrap_version=$(GRML_DEBOOTSTRAP_VERSION) -var grml_debootstrap_local_path=$(GRML_DEBOOTSTRAP_LOCAL_PATH) debian64.json
+
 # Debian 10
 buster: fake-uname.so clean install
 	packer build -var debian_version=$@ -var grml_debootstrap_version=$(GRML_DEBOOTSTRAP_VERSION) -var grml_debootstrap_local_path=$(GRML_DEBOOTSTRAP_LOCAL_PATH) debian64.json
@@ -36,4 +40,4 @@ squeeze: fake-uname.so clean install
 lenny: fake-uname.so clean install
 	packer build -var debian_version=$@ -var grml_debootstrap_version=$(GRML_DEBOOTSTRAP_VERSION) -var grml_debootstrap_local_path=$(GRML_DEBOOTSTRAP_LOCAL_PATH) debian64.json
 
-.PHONY: compile buster stretch jessie wheezy squeeze lenny
+.PHONY: compile bullseye buster stretch jessie wheezy squeeze lenny
diff --git a/releasetable-man.txt b/releasetable-man.txt
index 289fa4a..6b679e7 100644
--- a/releasetable-man.txt
+++ b/releasetable-man.txt
@@ -1,4 +1,4 @@
-Current status (as of 2017-01-26):
+Current status (as of 2018-12-30):
 
   +----------------+-------------+
   | Release / Tool | debootstrap |
@@ -13,6 +13,8 @@ Current status (as of 2017-01-26):
   +----------------+-------------+
   | stretch        |  works      |
   +----------------+-------------+
+  | bullseye       |  works [2]  |
+  +----------------+-------------+
   | sid            |  works [2]  |
   +----------------+-------------+
 
diff --git a/releasetable.txt b/releasetable.txt
index 63e3d23..d3f0316 100644
--- a/releasetable.txt
+++ b/releasetable.txt
@@ -8,5 +8,6 @@
 |jessie   |works
 |stretch  |works
 |buster   |works
+|bullseye |works[2]
 |sid      |works[2]
 |======================
-- 
2.1.4