From 8d2cb761abbded22c1b07cf6bda78294eae4122a Mon Sep 17 00:00:00 2001 From: Arnaud Rebillout Date: Thu, 1 Feb 2024 15:29:10 +0700 Subject: [PATCH] lxc-debian: Also add non-free-firmware when --enable-non-free Debian has a non-free-firmware component, starting bookworm, cf. https://www.debian.org/releases/bookworm/amd64/release-notes/ch-information.en.html#non-free-split Signed-off-by: Arnaud Rebillout --- templates/lxc-debian.in | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in index c5b1675..5cb624b 100644 --- a/templates/lxc-debian.in +++ b/templates/lxc-debian.in @@ -238,7 +238,14 @@ write_sourceslist() if [ "$mainonly" = 1 ]; then non_main='' else - non_main=' contrib non-free' + case "$release" in + wheezy|jessie|stretch|buster|bullseye) + non_main=' contrib non-free' + ;; + *) + non_main=' contrib non-free non-free-firmware' + ;; + esac fi cat >> "${rootfs}/etc/apt/sources.list" << EOF @@ -684,8 +691,8 @@ Options : -S, --auth-key=KEYFILE SSH public key to inject into the container as the root user. -a, --arch=ARCH The container architecture. Can be one of: i686, x86_64, amd64, armhf, armel, powerpc. Defaults to host arch. - -r, --release=RELEASE Debian release. Can be one of: wheezy, jessie, stretch, buster, sid. - Defaults to current stable. + -r, --release=RELEASE Debian release. Can be one of: wheezy, jessie, stretch, buster, + bullseye, bookworm, trixie, sid. Defaults to current stable. --mirror=MIRROR Debian mirror to use during installation. Overrides the MIRROR environment variable (see below). --keyring=KEYRING GPG keyring to authenticate the repository against. @@ -696,7 +703,7 @@ Options : --packages=PACKAGE_NAME1,PACKAGE_NAME2,... List of additional packages to install. Comma separated, without space. -c, --clean only clean up the cache and terminate - --enable-non-free include also Debian's contrib and non-free repositories. + --enable-non-free include also Debian's contrib, non-free and non-free-firmware repositories. -I|--interpreter-path=INTERPRETER-PATH Path of the binfmt interpreter to copy to the rootfs -F | --flush-cache Flush the debian release cache