--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear release team,
Please unblock package lxc-templates from unstable to testing.
lxc-templates 3.0.4-5, which has just been accepted in unstable, fixes 3 bugs
that will be beneficial for the stability of the package in bullseye. I should
clearly state that none of these bugs are release critical.
The first bug is to add a Suggest to qemu-user-static.
The second is to add a missing Recommend that made lxc-debian template not
working since a patch I made in October.
The third and last is to fix some errors in some templates that could lead to
catastrophic rm in case of sigint spawned while installing a container for some
distributions (arch, centos, ...). It contains the patch 0004, which is the
reason this debdiff has some lines
Please don't hesitate if you need more intel.
Here is the debdiff:
diff -Nru lxc-templates-3.0.4/debian/changelog lxc-templates-3.0.4/debian/changelog
--- lxc-templates-3.0.4/debian/changelog 2020-10-17 22:42:34.000000000 +0200
+++ lxc-templates-3.0.4/debian/changelog 2021-03-12 11:53:24.000000000 +0100
@@ -1,3 +1,18 @@
+lxc-templates (3.0.4-5) unstable; urgency=medium
+
+ [ Gianfranco Costamagna ]
+ * d/control:
+ - Add Suggests: qemu-user-static (Closes: #973345)
+
+ [ Pierre-Elliott Bécue ]
+ * d/control:
+ - Add distro-info to the Recommends of lxc-templates (Closes: #974569)
+ - Bump Standards-Version to 4.5.1
+ * d/p/0004: fix path variable in some templates to avoid catastrophic rm
+ (Closes: #839843)
+
+ -- Pierre-Elliott Bécue <peb@debian.org> Fri, 12 Mar 2021 11:53:24 +0100
+
lxc-templates (3.0.4-4) unstable; urgency=medium
* d/patches/0002: Update lxc.debian template to document alternatives to the
diff -Nru lxc-templates-3.0.4/debian/control lxc-templates-3.0.4/debian/control
--- lxc-templates-3.0.4/debian/control 2020-10-17 22:42:34.000000000 +0200
+++ lxc-templates-3.0.4/debian/control 2021-03-12 11:53:22.000000000 +0100
@@ -4,7 +4,7 @@
Maintainer: pkg-lxc <pkg-lxc-devel@lists.alioth.debian.org>
Uploaders: Pierre-Elliott Bécue <peb@debian.org>
Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
Homepage: https://linuxcontainers.org/
Vcs-Git: https://salsa.debian.org/lxc-team/lxc-templates.git
Vcs-Browser: https://salsa.debian.org/lxc-team/lxc-templates
@@ -17,11 +17,13 @@
busybox-static,
cloud-image-utils | cloud-utils,
debootstrap | cdebootstrap,
+ distro-info,
mmdebstrap,
openssl,
rsync,
uuid-runtime,
xz-utils
+Suggests: qemu-user-static
Description: Linux Containers userspace tools (templates)
Containers are insulated areas inside a system, which have their own namespace
for filesystem, network, PID, IPC, CPU and memory allocation and which can be
diff -Nru lxc-templates-3.0.4/debian/patches/0004-Fixes-path-variable-in-some-templates.patch lxc-templates-3.0.4/debian/patches/0004-Fixes-path-variable-in-some-templates.patch
--- lxc-templates-3.0.4/debian/patches/0004-Fixes-path-variable-in-some-templates.patch 1970-01-01 01:00:00.000000000 +0100
+++ lxc-templates-3.0.4/debian/patches/0004-Fixes-path-variable-in-some-templates.patch 2021-03-12 11:50:28.000000000 +0100
@@ -0,0 +1,180 @@
+From: =?utf-8?q?Pierre-Elliott_B=C3=A9cue?= <becue@crans.org>
+Date: Fri, 12 Mar 2021 11:50:00 +0100
+Subject: Fixes path variable in some templates
+
+The behaviour of the path variable is somewhat inconsistent with a
+relevant way of generating containers. path now points to a directory,
+where ${path}/${name} will be created and handle the new container's
+config/rootfs
+---
+ templates/lxc-archlinux.in | 8 +++++---
+ templates/lxc-centos.in | 6 ++++--
+ templates/lxc-fedora-legacy.in | 8 +++++---
+ templates/lxc-fedora.in | 8 +++++---
+ templates/lxc-pld.in | 7 +++++--
+ templates/lxc-voidlinux.in | 8 +++++++-
+ 6 files changed, 31 insertions(+), 14 deletions(-)
+
+diff --git a/templates/lxc-archlinux.in b/templates/lxc-archlinux.in
+index f8d4ba0..afa2f11 100644
+--- a/templates/lxc-archlinux.in
++++ b/templates/lxc-archlinux.in
+@@ -206,8 +206,8 @@ usage:
+ Mandatory args:
+ -n,--name container name, used to as an identifier for that container from now on
+ Optional args:
+- -p,--path path to where the container rootfs will be created (${default_path})
+- --rootfs path for actual container rootfs, (${default_path}/rootfs)
++ -p,--path path the directory where the container directory will be created (${default_path})
++ --rootfs path for actual container rootfs, (${default_path}/{container_name}/rootfs)
+ -P,--packages preinstall additional packages, comma-separated list
+ -e,--enable_units enable systemd services, comma-separated list
+ -d,--disable_units disable systemd services, comma-separated list
+@@ -256,9 +256,11 @@ if [ ${?} -ne 0 ]; then
+ fi
+
+ if [ -z "${path}" ]; then
+- path="${default_path}/${name}"
++ path="${default_path}"
+ fi
+
++path="${path}/${name}"
++
+ if [ "${EUID}" != "0" ]; then
+ echo "This script should be run as 'root'"
+ exit 1
+diff --git a/templates/lxc-centos.in b/templates/lxc-centos.in
+index eba5ec8..7145845 100644
+--- a/templates/lxc-centos.in
++++ b/templates/lxc-centos.in
+@@ -708,7 +708,7 @@ usage:
+ Mandatory args:
+ -n,--name container name, used to as an identifier for that container from now on
+ Optional args:
+- -p,--path path to where the container rootfs will be created, defaults to /var/lib/lxc/name.
++ -p,--path path to where the container directory will be created, defaults to /var/lib/lxc.
+ -c,--clean clean the cache
+ -R,--release CentOS release for the new container. If the host is CentOS, then it will default to the host's release.
+ --fqdn fully qualified domain name (FQDN) for DNS and system naming
+@@ -847,9 +847,11 @@ if [ $? -ne 0 ]; then
+ fi
+
+ if [ -z "$path" ]; then
+- path=$default_path/$name
++ path=$default_path
+ fi
+
++path="${path}/${name}"
++
+ if [ -z "$release" ]; then
+ if [ "$is_centos" -a "$centos_host_ver" ]; then
+ release=$centos_host_ver
+diff --git a/templates/lxc-fedora-legacy.in b/templates/lxc-fedora-legacy.in
+index 3ef3415..d42d6a6 100644
+--- a/templates/lxc-fedora-legacy.in
++++ b/templates/lxc-fedora-legacy.in
+@@ -1187,8 +1187,8 @@ usage:
+ Mandatory args:
+ -n,--name container name, used to as an identifier for that container
+ Optional args:
+- -p,--path path to where the container will be created,
+- defaults to @LXCPATH@.
++ -p,--path path to the directory where the container'directory will be
++ created, defaults to @LXCPATH@.
+ --rootfs path for actual rootfs.
+ -c,--clean clean the cache
+ -R,--release Fedora release for the new container.
+@@ -1348,9 +1348,11 @@ if [ -n "$needed_pkgs" ]; then
+ fi
+
+ if [ -z "$path" ]; then
+- path=$default_path/$name
++ path=$default_path
+ fi
+
++path="${path}/${name}"
++
+ if [ -z "$release" ]; then
+ if [ "$is_fedora" -a "$fedora_host_ver" ]; then
+ release=$fedora_host_ver
+diff --git a/templates/lxc-fedora.in b/templates/lxc-fedora.in
+index 51868a6..f6e5191 100644
+--- a/templates/lxc-fedora.in
++++ b/templates/lxc-fedora.in
+@@ -983,8 +983,8 @@ Template options:
+ -h, --help Print this help text
+ --mask-tmp Prevent systemd from over-mounting /tmp with tmpfs.
+ -M, --mirror=MIRROR Fedora mirror to use during installation.
+- -p, --path=PATH Path to where the container will be created,
+- defaults to ${lxc_path}.
++ -p, --path=PATH Path to the directory where the container's directory
++ will be created, defaults to ${lxc_path}.
+ -P, --packages=PKGS Comma-separated list of additional RPM packages to
+ install into the container.
+ -R, --release=RELEASE Fedora release number of the container, defaults
+@@ -1216,9 +1216,11 @@ fi
+ # set container directory
+ if [ -z "${path}" ]
+ then
+- path="${lxc_path}/${name}"
++ path="${lxc_path}"
+ fi
+
++path="${path}/${name}"
++
+ # set container rootfs and configuration path
+ config="${path}/config"
+ if [ -z "${rootfs}" ]
+diff --git a/templates/lxc-pld.in b/templates/lxc-pld.in
+index b748cb8..a333943 100644
+--- a/templates/lxc-pld.in
++++ b/templates/lxc-pld.in
+@@ -319,7 +319,8 @@ usage:
+ Mandatory args:
+ -n,--name container name, used to as an identifier for that container from now on
+ Optional args:
+- -p,--path path to where the container will be created, defaults to @LXCPATH@. The container config will go under @LXCPATH@ in that case
++ -p,--path path to the directory where the container's directory will be created, defaults to @LXCPATH@.
++ The container config will go under @LXCPATH@ in that case
+ --rootfs path for actual rootfs.
+ -c,--clean clean the cache
+ -R,--release PLD Linux release for the new container. if the host is PLD Linux, then it will default to the host's release.
+@@ -397,9 +398,11 @@ if [ -n "$needed_pkgs" ]; then
+ fi
+
+ if [ -z "$path" ]; then
+- path=$default_path/$name
++ path=$default_path
+ fi
+
++path="${path}/${name}"
++
+ if [ -z "$release" ]; then
+ if [ "$is_pld" -a "$pld_host_ver" ]; then
+ release=$pld_host_ver
+diff --git a/templates/lxc-voidlinux.in b/templates/lxc-voidlinux.in
+index d74da38..0ba74ef 100644
+--- a/templates/lxc-voidlinux.in
++++ b/templates/lxc-voidlinux.in
+@@ -103,7 +103,7 @@ usage:
+ Mandatory args:
+ -n,--name container name, used to as an identifier for that container from now on
+ Optional args:
+- -p,--path path to where the container rootfs will be created (${default_path})
++ -p,--path path to the directory where the container's directory will be created (${default_path})
+ --rootfs path for actual container rootfs, (${default_path}/rootfs)
+ -P,--packages preinstall additional packages, comma-separated list
+ -c,--config use specified pacman config when installing container packages
+@@ -152,6 +152,12 @@ if [ ${?} -ne 0 ]; then
+ echo "'xbps-query' command is missing."
+ fi
+
++if [ -z "${path}" ]; then
++ path="${default_path}"
++fi
++
++path="${path}/${name}"
++
+ if [ -z "${rootfs_path}" ]; then
+ rootfs_path="${path}/rootfs"
+ fi
diff -Nru lxc-templates-3.0.4/debian/patches/series lxc-templates-3.0.4/debian/patches/series
--- lxc-templates-3.0.4/debian/patches/series 2020-10-17 22:42:34.000000000 +0200
+++ lxc-templates-3.0.4/debian/patches/series 2021-03-12 11:50:28.000000000 +0100
@@ -1,3 +1,4 @@
0001-lxc-debian-Handle-languages-that-are-only-UTF-8-enco.patch
0002-Add-references-to-mmdebstrap-and-some-documentation-.patch
0003-Handle-properly-the-future-security-repositories.patch
+0004-Fixes-path-variable-in-some-templates.patch
unblock lxc-templates/3.0.4-5
-- System Information:
Debian Release: 10.8
APT prefers stable
APT policy: (990, 'stable'), (500, 'stable-updates'), (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 4.19.0-10-amd64 (SMP w/8 CPU cores)
Kernel taint flags: TAINT_USER
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to fr_FR.UTF-8), LANGUAGE=fr_FR.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to fr_FR.UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
--- End Message ---