neil/lxc-templates
1
0
Fork 1
mirror of https://github.com/lxc/lxc-templates.git synced 2026-09-19 06:31:31 +00:00
Code Issues Projects Releases Wiki Activity

lxc-debian: Also add non-free-firmware when --enable-non-free

Browse Source 
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 <arnaudr@kali.org>
This commit is contained in:
Arnaud Rebillout
2024-02-01 15:55:48 +07:00
parent 06268b7ff8
commit 8d2cb761ab
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/lxc-debian.in
+11 -4
View File
@@ -238,7 +238,14 @@ write_sourceslist()
if [ "$mainonly" = 1 ]; then if [ "$mainonly" = 1 ]; then
non_main='' non_main=''
else 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 fi
cat >> "${rootfs}/etc/apt/sources.list" << EOF 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. -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, -a, --arch=ARCH The container architecture. Can be one of: i686, x86_64,
amd64, armhf, armel, powerpc. Defaults to host arch. amd64, armhf, armel, powerpc. Defaults to host arch.
-r, --release=RELEASE Debian release. Can be one of: wheezy, jessie, stretch, buster, sid. -r, --release=RELEASE Debian release. Can be one of: wheezy, jessie, stretch, buster,
Defaults to current stable. bullseye, bookworm, trixie, sid. Defaults to current stable.
--mirror=MIRROR Debian mirror to use during installation. Overrides the MIRROR --mirror=MIRROR Debian mirror to use during installation. Overrides the MIRROR
environment variable (see below). environment variable (see below).
--keyring=KEYRING GPG keyring to authenticate the repository against. --keyring=KEYRING GPG keyring to authenticate the repository against.
@@ -696,7 +703,7 @@ Options :
--packages=PACKAGE_NAME1,PACKAGE_NAME2,... --packages=PACKAGE_NAME1,PACKAGE_NAME2,...
List of additional packages to install. Comma separated, without space. List of additional packages to install. Comma separated, without space.
-c, --clean only clean up the cache and terminate -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 -I|--interpreter-path=INTERPRETER-PATH
Path of the binfmt interpreter to copy to the rootfs Path of the binfmt interpreter to copy to the rootfs
-F | --flush-cache Flush the debian release cache -F | --flush-cache Flush the debian release cache