update to 6.0.0

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/debian/patches/extra/0001-cgv2-assume-swap-is-supported.patch b/debian/patches/extra/0001-cgv2-assume-swap-is-supported.patch
deleted file mode 100644 (file)
index c5d4a1a..0000000
--- a/debian/patches/extra/0001-cgv2-assume-swap-is-supported.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Date: Thu, 2 Dec 2021 13:05:28 +0100
-Subject: [PATCH lxcfs] cgv2: assume swap is supported
-
-because this is just wrong and fixing it is annoying
-
-Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
----
- src/cgroups/cgfsng.c | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/src/cgroups/cgfsng.c b/src/cgroups/cgfsng.c
-index 3eb4227..fed7911 100644
---- a/src/cgroups/cgfsng.c
-+++ b/src/cgroups/cgfsng.c
-@@ -626,12 +626,10 @@ static bool cgfsng_can_use_swap(struct cgroup_ops *ops)
-               return false;
- 
-       if (is_unified_hierarchy(h)) {
--              if (faccessat(h->fd, "memory.swap.max", F_OK, 0))
--                      return false;
--
--              if (faccessat(h->fd, "memory.swap.current", F_OK, 0))
--                      return false;
--
-+              /* the files to check for don't exist at the root cgroup
-+               * directory so let's assume yes, other kernel configs are
-+               * simply not supported on pve
-+               */
-               has_swap = true;
-       } else {
-               if (faccessat(h->fd, "memory.memsw.limit_in_bytes", F_OK, 0))

diff --git a/debian/patches/extra/0002-build-tools-keep-trailing-newline-in-jinja2-renderer.patch b/debian/patches/extra/0002-build-tools-keep-trailing-newline-in-jinja2-renderer.patch
deleted file mode 100644 (file)
index 44a8433..0000000
--- a/debian/patches/extra/0002-build-tools-keep-trailing-newline-in-jinja2-renderer.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Date: Thu, 19 Jan 2023 11:13:46 +0100
-Subject: [PATCH 2/2] build: tools: keep trailing newline in jinja2 renderer
-
-Otherwise /usr/share/lxc/config/common.conf.d/00-lxcfs.conf
-loses its trailing newline
-
-Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
----
- tools/meson-render-jinja2.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tools/meson-render-jinja2.py b/tools/meson-render-jinja2.py
-index 0f9fc43..c7b6c38 100755
---- a/tools/meson-render-jinja2.py
-+++ b/tools/meson-render-jinja2.py
-@@ -23,7 +23,12 @@ def parse_config_h(filename):
- 
- def render(filename, defines):
-     text = open(filename).read()
--    template = jinja2.Template(text, trim_blocks=True, undefined=jinja2.StrictUndefined)
-+    template = jinja2.Template(
-+        text,
-+        trim_blocks=True,
-+        keep_trailing_newline=True,
-+        undefined=jinja2.StrictUndefined,
-+    )
-     return template.render(defines)
- 
- if __name__ == '__main__':
--- 
-2.30.2
-

diff --git a/debian/patches/series b/debian/patches/series
index a4512fbc9513d45085e6130e62e3304d5e857b6b..bf650b42b1037ca3c7f99c19421c9e1728402554 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 do-not-start-without-lxcfs.patch
-extra/0001-cgv2-assume-swap-is-supported.patch
-extra/0002-build-tools-keep-trailing-newline-in-jinja2-renderer.patch

diff --git a/debian/rules b/debian/rules
index 5b5bf7bf7d3e2a1dcb3136228ec94f2421023420..c2e6dbb42c3ca1c63c072fe77c4ccc35805b5365 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,4 @@ override_dh_auto_install:
        dh_auto_install --destdir=debian/lxcfs
 
 override_dh_installsystemd:
-       install -dm755 $(CURDIR)/debian/lxcfs/lib
-       mv $(CURDIR)/debian/lxcfs/usr/lib/systemd \
-          $(CURDIR)/debian/lxcfs/lib/systemd
        dh_installsystemd -p lxcfs --no-start --no-stop-on-upgrade lxcfs.service

diff --git a/lxcfs b/lxcfs
index 01c2e3b813f824d6ba21d4732a8247a04e35adaa..d837e798fca50629992d38ed3f935116740d3401 160000 (submodule)
--- a/lxcfs
+++ b/lxcfs
@@ -1 +1 @@
-Subproject commit 01c2e3b813f824d6ba21d4732a8247a04e35adaa
+Subproject commit d837e798fca50629992d38ed3f935116740d3401