debian: fix non-free repo enable for DEB822 sources format

.github/workflows/test-debian.yml

@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        debian-version: ['bookworm', 'trixie']
+        debian-version: ['trixie']
       fail-fast: false
 
     steps:

debian/install-packages

@@ -2,8 +2,16 @@
 # source <(curl -fsSL https://raw.githubusercontent.com/mapitman/linux-bootstrap/main/debian/install-packages)
 
 # Enable non-free and contrib repositories if not already enabled
-if ! grep -q "non-free " /etc/apt/sources.list 2>/dev/null; then
-    sudo sed -i 's/^\(deb .*debian\.org.*\) \(main\)/\1 \2 contrib non-free/' /etc/apt/sources.list
+if [ -f /etc/apt/sources.list.d/debian.sources ]; then
+    # DEB822 format (Debian trixie+)
+    if ! grep -q "non-free" /etc/apt/sources.list.d/debian.sources 2>/dev/null; then
+        sudo sed -i 's/^Components: main$/Components: main contrib non-free/' /etc/apt/sources.list.d/debian.sources
+    fi
+elif [ -f /etc/apt/sources.list ]; then
+    # Legacy one-line format
+    if ! grep -q "non-free " /etc/apt/sources.list 2>/dev/null; then
+        sudo sed -i 's/^\(deb .*debian\.org.*\) \(main\)/\1 \2 contrib non-free/' /etc/apt/sources.list
+    fi
 fi
 
 # Update package repos

test/docker/Dockerfile.debian-noninteractive

@@ -4,7 +4,7 @@
 #   docker build -f test/docker/Dockerfile.debian-noninteractive -t debian-bootstrap-test-auto .
 #   docker run --rm debian-bootstrap-test-auto
 
-ARG DEBIAN_VERSION=bookworm
+ARG DEBIAN_VERSION=trixie
 FROM debian:${DEBIAN_VERSION}
 
 ENV DEBIAN_FRONTEND=noninteractive