test-appliance: teach gen-image to create images for Debian Bookworm

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

5 files changed, 8 insertions, 3 deletions

diff --git a/test-appliance/gen-image b/test-appliance/gen-image
index cd19bca9..1144c4d1 100755
--- a/test-appliance/gen-image
+++ b/test-appliance/gen-image
@@ -27,8 +27,8 @@ fi
 
 if test -f ../fstests-bld/xfstests/build-distro ; then
     distro=$(cat ../fstests-bld/xfstests/build-distro)
-    if test "$distro" = bullseye ; then
-	SUITE=bullseye
+    if test "$distro" = bookworm -o "$distro" = bullseye; then
+	SUITE="$distro"
     else
 	SUITE=buster
     fi
diff --git a/test-appliance/xfstests-packages b/test-appliance/xfstests-packages
index 511639ce..319413a7 100644
--- a/test-appliance/xfstests-packages
+++ b/test-appliance/xfstests-packages
@@ -14,7 +14,6 @@ dmsetup
 dosfstools
 dump
 ed
-exfat-utils
 f2fs-tools
 file
 gawk
diff --git a/test-appliance/xfstests-packages.bookworm b/test-appliance/xfstests-packages.bookworm
new file mode 100644
index 00000000..334545ce
--- /dev/null
+++ b/test-appliance/xfstests-packages.bookworm
@@ -0,0 +1,4 @@
+exfatprogs
+libicu72
+rsyslog
+
diff --git a/test-appliance/xfstests-packages.bullseye b/test-appliance/xfstests-packages.bullseye
index 4b9f652f..9b52357c 100644
--- a/test-appliance/xfstests-packages.bullseye
+++ b/test-appliance/xfstests-packages.bullseye
@@ -1 +1,2 @@
+exfatprogs
 libicu67
diff --git a/test-appliance/xfstests-packages.buster b/test-appliance/xfstests-packages.buster
index 02162a42..33fe9b7a 100644
--- a/test-appliance/xfstests-packages.buster
+++ b/test-appliance/xfstests-packages.buster
@@ -1,3 +1,4 @@
+exfat-utils
 duperemove
 libgdbm6
 libicu63