Control: tags -1 + patch On Thu, 8 Jan 2026 11:33:09 +0100 Paul Gevers <[email protected]> wrote: > [...] For lxc-templates, > it works to replace isc-dhcp-client by dhcpd-base (I'm told at least for > trixie and newer) as I've done locally on our loong64 host for > ci.debian.net.
Dear Maintainer, Tests of dnsmasq in stable ran into problems because of this hack [1]. Attached patch to lxc-templates solves the issue properly according to my tests. Please consider applying it per 'quilt import ...'. Alternatively, accept my MR [2]. On Thu, 12 Feb 2026 13:59:24 +0700 Arnaud Rebillout <[email protected]> wrote: > [...] > I tried to replace isc-dhcp-client by dhcpd-base and it fixes the image > builds at least. So I've opened a MR at > https://salsa.debian.org/salsa-ci-team/autopkgtest-lxc/-/merge_requests/42 > > I applied this change to Kali Linux CI (lightweight fork of Salsa CI) as > well, so it's running in prod since yesterday, so far so good. Hello Arnaud, The patch contains a hack to still be able to install isc-dhcp-client as your fix replaces string 'isc-dhcp-client' regardless of context. You should be able to roll back your commit as soon as lxc-templates becomes available with the proposed patch applied. Best, Sven [1] https://lists.debian.org/debian-ci/2026/03/msg00000.html [2] https://salsa.debian.org/lxc-team/lxc-templates/-/merge_requests/3 -- GPG Fingerprint 3DF5 E8AA 43FC 9FDF D086 F195 ADF5 0EDA F8AD D585
Description: Select dhcp-client according to release For releases with codename trixie and before select isc-dhcp-client, otherwise select dhcpcd-base. This way the dhcp-client installed in the container matches the one that comes with the respective release by default. . This patch also contains a workaround to deal with a hack applied in https://salsa.debian.org/salsa-ci-team/autopkgtest-lxc, commit 479b0daa166b90c26f8afa85eb5f174fc10cf0b2. Author: Sven Geuer <[email protected]> Bug-Debian: https://bugs.debian.org/1125011 Forwarded: not-needed Last-Update: 2026-03-06 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/templates/lxc-debian.in +++ b/templates/lxc-debian.in @@ -80,6 +80,8 @@ local release_file=$(wget "${1}/dists/${release}/Release" -O - --quiet 2> /dev/null) distro_suite=${release_file#*Suite: } distro_suite=${distro_suite%%$'\n'*} + distro_codename=${release_file#*Codename: } + distro_codename=${distro_codename%%$'\n'*} return 0 fi return 1 @@ -413,13 +415,26 @@ iproute=iproute2 ;; esac + # Check by codename as stable and testing are moving targets + case "$distro_codename" in + wheezy|jessie|stretch|buster|bullseye|bookworm|trixie) + # Hide the lowercase package name to work around + # commit 479b0daa166b90c26f8afa85eb5f174fc10cf0b2 in + # https://salsa.debian.org/salsa-ci-team/autopkgtest-lxc + dhcpclient=ISC-DHCP-CLIENT + dhcpclient=${dhcpclient@L} + ;; + *) + dhcpclient=dhcpcd-base + ;; + esac packages=\ $init,\ ifupdown,\ locales,\ ca-certificates,\ dialog,\ -isc-dhcp-client,\ +$dhcpclient,\ netbase,\ net-tools,\ $iproute,\
signature.asc
Description: This is a digitally signed message part
