From 5aef5f9a3c8472b7051f668a6aba5ef2df5778c2 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Fri, 1 Jul 2022 11:29:54 +0200 Subject: [PATCH] update patches to fix fuse bind mounting Signed-off-by: Wolfgang Bumiller --- .../lxc/0001-add-check-for-statvfs.patch | 33 +++++++++++++++++++ ...ervice-start-after-a-potential-syslo.patch | 2 +- ...fig-deny-rw-mounting-of-sys-and-proc.patch | 2 +- ...-PVE-Config-attach-always-use-getent.patch | 2 +- debian/patches/series | 1 + 5 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 debian/patches/lxc/0001-add-check-for-statvfs.patch diff --git a/debian/patches/lxc/0001-add-check-for-statvfs.patch b/debian/patches/lxc/0001-add-check-for-statvfs.patch new file mode 100644 index 0000000..8900f86 --- /dev/null +++ b/debian/patches/lxc/0001-add-check-for-statvfs.patch @@ -0,0 +1,33 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Wolfgang Bumiller +Date: Fri, 1 Jul 2022 11:09:15 +0200 +Subject: [PATCH lxc] add check for statvfs + +we use HAVE_STATVFS in the code but this was not added to +config.h + +Signed-off-by: Wolfgang Bumiller +--- + meson.build | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/meson.build b/meson.build +index 43362d37a..274511037 100644 +--- a/meson.build ++++ b/meson.build +@@ -493,6 +493,7 @@ foreach tuple: [ + ['sigdescr_np'], + ['signalfd'], + ['statx'], ++ ['statvfs'], + ['strlcat'], + ['strlcpy'], + ['unshare'], +@@ -622,6 +623,7 @@ foreach ident: [ + ['setns', '''#include '''], + ['sigdescr_np', '''#include '''], + ['signalfd', '''#include '''], ++ ['statvfs', '''#include '''], + ['statx', '''#include + #include + #include '''], diff --git a/debian/patches/pve/0001-PVE-Config-lxc.service-start-after-a-potential-syslo.patch b/debian/patches/pve/0001-PVE-Config-lxc.service-start-after-a-potential-syslo.patch index 694a656..09e74ff 100644 --- a/debian/patches/pve/0001-PVE-Config-lxc.service-start-after-a-potential-syslo.patch +++ b/debian/patches/pve/0001-PVE-Config-lxc.service-start-after-a-potential-syslo.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Fri, 10 Feb 2017 09:13:40 +0100 -Subject: [PATCH] PVE: [Config] lxc.service: start after a potential +Subject: [PATCH lxc] PVE: [Config] lxc.service: start after a potential syslog.service We could add this as a snippet from pve-container instead. diff --git a/debian/patches/pve/0002-PVE-Config-deny-rw-mounting-of-sys-and-proc.patch b/debian/patches/pve/0002-PVE-Config-deny-rw-mounting-of-sys-and-proc.patch index ea82472..cdcfaad 100644 --- a/debian/patches/pve/0002-PVE-Config-deny-rw-mounting-of-sys-and-proc.patch +++ b/debian/patches/pve/0002-PVE-Config-deny-rw-mounting-of-sys-and-proc.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 9 Nov 2016 09:14:26 +0100 -Subject: [PATCH] PVE: [Config] deny rw mounting of /sys and /proc +Subject: [PATCH lxc] PVE: [Config] deny rw mounting of /sys and /proc Note that we don't actually make use of this anymore, since we switched to the generated profiles which already do this. diff --git a/debian/patches/pve/0003-PVE-Config-attach-always-use-getent.patch b/debian/patches/pve/0003-PVE-Config-attach-always-use-getent.patch index 5a4f51c..b328b9f 100644 --- a/debian/patches/pve/0003-PVE-Config-attach-always-use-getent.patch +++ b/debian/patches/pve/0003-PVE-Config-attach-always-use-getent.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Tue, 13 Aug 2019 13:57:22 +0200 -Subject: [PATCH] PVE: [Config] attach: always use getent +Subject: [PATCH lxc] PVE: [Config] attach: always use getent In debian buster, some libnss plugins (if installed) can cause getpwent to segfault instead of erroring out cleanly. diff --git a/debian/patches/series b/debian/patches/series index ee20ef5..16a3cb3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +lxc/0001-add-check-for-statvfs.patch pve/0001-PVE-Config-lxc.service-start-after-a-potential-syslo.patch pve/0002-PVE-Config-deny-rw-mounting-of-sys-and-proc.patch pve/0003-PVE-Config-attach-always-use-getent.patch -- 2.39.2