[pve-devel] [PATCH lxcfs 1/1] d/rules: Allow passing options to the lxcfs systemd unit

[Antonio Huete Jimenez]

Fixes: https://forum.proxmox.com/threads/45724
Signed-off-by: Antonio Huete <tuxillo at quantumachine.net>
---
 debian/changelog                        |  6 ++++++
 debian/lxcfs.default                    |  4 ++++
 debian/patches/allow-passing-opts.patch | 16 ++++++++++++++++
 debian/patches/series                   |  1 +
 debian/rules                            |  3 +++
 5 files changed, 30 insertions(+)
 create mode 100644 debian/lxcfs.default
 create mode 100644 debian/patches/allow-passing-opts.patch

diff --git a/debian/changelog b/debian/changelog
index 1643126..67ec130 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lxcfs (6.0.0-pve3) bookworm; urgency=medium
+
+  * Allow passing opts to the lxcfs systemd unit
+
+ -- Proxmox Support Team <support at proxmox.com>  Mon, 12 May 2024 08:01:01 +0200
+
 lxcfs (6.0.0-pve2) bookworm; urgency=medium
 
   * don't treat reload failure as fatal in postinst
diff --git a/debian/lxcfs.default b/debian/lxcfs.default
new file mode 100644
index 0000000..1d3bc09
--- /dev/null
+++ b/debian/lxcfs.default
@@ -0,0 +1,4 @@
+# Default settings for lxcfs.
+
+# lxcfs specific options
+LXCFS_OPTS=""
diff --git a/debian/patches/allow-passing-opts.patch b/debian/patches/allow-passing-opts.patch
new file mode 100644
index 0000000..487d061
--- /dev/null
+++ b/debian/patches/allow-passing-opts.patch
@@ -0,0 +1,16 @@
+Index: lxcfs-6.0.0/config/init/systemd/lxcfs.service.in
+===================================================================
+--- new.orig/config/init/systemd/lxcfs.service.in
++++ new/config/init/systemd/lxcfs.service.in
+@@ -5,9 +5,10 @@ Before=lxc.service
+ Documentation=man:lxcfs(1)
+ 
+ [Service]
++EnvironmentFile=-/etc/default/lxcfs
+ OOMScoreAdjust=-1000
+ ExecStartPre=/bin/mkdir -p {{LXCFSTARGETDIR}}
+-ExecStart=/usr/bin/lxcfs {{LXCFSTARGETDIR}}
++ExecStart=/usr/bin/lxcfs ${LXCFS_OPTS} {{LXCFSTARGETDIR}}
+ KillMode=process
+ Restart=on-failure
+ ExecStopPost=-/bin/fusermount -u {{LXCFSTARGETDIR}}
diff --git a/debian/patches/series b/debian/patches/series
index bf650b4..cc36fad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+allow-passing-opts.patch
 do-not-start-without-lxcfs.patch
diff --git a/debian/rules b/debian/rules
index c2e6dbb..ad0e0cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,5 +18,8 @@ override_dh_auto_configure:
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/lxcfs
 
+override_dh_installinit:
+	dh_installinit -p lxcfs --no-stop-on-upgrade
+
 override_dh_installsystemd:
 	dh_installsystemd -p lxcfs --no-start --no-stop-on-upgrade lxcfs.service
-- 
2.42.0