From 132cb9bfba00ad7c79c38ac72cb30846bb645908 Mon Sep 17 00:00:00 2001 From: Dave13h Date: Wed, 17 Dec 2025 14:56:41 +0000 Subject: [PATCH] [INF-1575] Trixie Box Support --- README.md | 2 +- arm64/Makefile | 2 +- arm64/template.pkr.hcl | 4 +++- scripts/cleanup.sh | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e8be559..a11f08f 100644 --- a/README.md +++ b/README.md @@ -14,4 +14,4 @@ Distribution support is shown in the table below. | Buster | Not supported | | Bullseye | Supported | | Bookworm | Supported | -| Trixie | Planned | +| Trixie | Supported | diff --git a/arm64/Makefile b/arm64/Makefile index ee527b4..5b314d5 100644 --- a/arm64/Makefile +++ b/arm64/Makefile @@ -3,7 +3,7 @@ # Default variable values # BOX_VERSION has no default and must be set explicitly -OS_CODENAME ?= bookworm +OS_CODENAME ?= trixie BOX_CHANNEL ?= stable # Alias targets diff --git a/arm64/template.pkr.hcl b/arm64/template.pkr.hcl index af74a71..d669122 100644 --- a/arm64/template.pkr.hcl +++ b/arm64/template.pkr.hcl @@ -24,6 +24,7 @@ variable "os_releases" { # "buster" = "10.13.0", "bullseye" = "11.11.0", "bookworm" = "12.6.0", + "trixie" = "13.1.0", } } variable "os_hashes" { @@ -32,6 +33,7 @@ variable "os_hashes" { # "buster" = "a20a5437e243186ac8d678202cf55a253e8d37df2b187da885796d5071ba829f", "bullseye" = "c81b6081d5dc5cfac49310b104eb9843252fd3c97cedbcd69ec0388798e7ef7e", "bookworm" = "38dc21a00ca96dab9754c9c6e8eea55549befc99dbe88d4e3c8af4bd622ab22f", + "trixie" = "9ecd75a62d90ecedfc3f7fcdf46c349bb4ebfb79553514c9d96239cd9bada820", } } @@ -98,7 +100,7 @@ build { "../scripts/vagrant.sh", "../scripts/cleanup.sh", "../scripts/base_version.sh", - "../scripts/zerodisk.sh" + # "../scripts/zerodisk.sh" # this is different on Trixie, /tmp is now tmpfs by default ] } diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh index 5a46e87..54b40b3 100644 --- a/scripts/cleanup.sh +++ b/scripts/cleanup.sh @@ -33,7 +33,7 @@ dpkg --list \ # Removing DHCP, cache, ... echo "==> Cleaning up /var ..." # DHCP leases -rm /var/lib/dhcp/* +# rm /var/lib/dhcp/* # Not on Trixie? # empty cache find /var/cache -type f -exec rm -rf {} \;