From 78eb32cb37c22f859b813aff3cfed48ec8a08150 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Tue, 15 Nov 2022 11:18:23 +0100
Subject: [PATCH] packer: add support for Debian/bookworm

---
 packer/Makefile              | 4 ++++
 packer/debian64.bats         | 2 +-
 packer/debian64_provision.sh | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packer/Makefile b/packer/Makefile
index 9d60c35..27f91b0 100644
--- a/packer/Makefile
+++ b/packer/Makefile
@@ -25,6 +25,10 @@ clean:
 	$(RM) *.o *.so
 	rm -rf local_dir
 
+# Debian 12
+bookworm: clean fake-uname.so 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 11
 bullseye: clean fake-uname.so install
 	packer build -var debian_version=$@ -var grml_debootstrap_version=$(GRML_DEBOOTSTRAP_VERSION) -var grml_debootstrap_local_path=$(GRML_DEBOOTSTRAP_LOCAL_PATH) debian64.json
diff --git a/packer/debian64.bats b/packer/debian64.bats
index 80481a5..3e5818c 100644
--- a/packer/debian64.bats
+++ b/packer/debian64.bats
@@ -17,7 +17,7 @@ teardown() {
 @test "debian_version exists and is valid version" {
   run cat "${mountpath}/etc/debian_version"
   [ "$status" -eq 0 ]
-  [[ "$output" == [0-9]*.[0-9]* ]] || [[ "$output" == 'bullseye/sid' ]]
+  [[ "$output" == [0-9]*.[0-9]* ]] || [[ "$output" == 'bookworm/sid' ]]
 }
 
 @test "kernel exists" {
diff --git a/packer/debian64_provision.sh b/packer/debian64_provision.sh
index 2a416de..98b4d37 100644
--- a/packer/debian64_provision.sh
+++ b/packer/debian64_provision.sh
@@ -234,7 +234,7 @@ grml_debootstrap_execution() {
 apply_nic_workaround() {
   # release specific stuff
   case "$DEBIAN_VERSION" in
-    stretch|buster|bullseye|unstable|sid)
+    stretch|buster|bullseye|bookworm|unstable|sid)
       ;;
     *)
       echo "* Debian $DEBIAN_VERSION doesn't require NIC workaround"
-- 
2.1.4