From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 815E61FF390 for ; Fri, 7 Jun 2024 13:00:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 288211D3BB; Fri, 7 Jun 2024 13:01:22 +0200 (CEST) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=quantumachine.net; q=dns/txt; s=k1; t=1715610703; x=1715617903; h=Content-Transfer-Encoding: MIME-Version: References: In-Reply-To: Message-ID: Date: Subject: Subject: Cc: To: To: From: From: Sender: Sender; bh=Yr1nbonaBihRlGZKPQovLVjYeNWrXFQboFaG+NA6lpU=; b=bHKfd3D+T2o26nvegQ7iFaXhgsQ6t/ANh39oqtYXtKWGcVdvCIVfJSxkiIrDeyxzHUk3Jq5a9qvNTLiEstfzhaNBNACVmrjrRwlJbaxkRSyFg332aINx2xzSRK8WojZGYOaT1GuWFJzitE8t5ZatSc9najS+79gCSATN/BgBkaD7IyatblGlp5ic8g9SYYv4+pFhSh/0nqcpHciLBWc2xe0wpkSCR+Xr93fklCIb4EppvN/DbrHbNgluJESuEOyP6MkbB3kEB0Fcw4LFiLWtM6W1tsaVXPJzyb96fUF0aRJHJa3zBy697txQEgd4eCzOd+0ZiaqlWhp3CUzpnACwGg== X-Mailgun-Sending-Ip: 185.250.239.4 X-Mailgun-Sid: WyJhNzgzYiIsInB2ZS1kZXZlbEBsaXN0cy5wcm94bW94LmNvbSIsIjBiNTciXQ== From: Antonio Huete Jimenez To: pve-devel@lists.proxmox.com Date: Mon, 13 May 2024 16:21:28 +0200 Message-ID: <20240513142128.234017-2-tuxillo@quantumachine.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240513142128.234017-1-tuxillo@quantumachine.net> References: <20240513142128.234017-1-tuxillo@quantumachine.net> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 BAYES_00 -1.9 Bayes spam probability is 0 to 1% DKIM_INVALID 0.1 DKIM or DK signature exists, but is not valid DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/, no trust RCVD_IN_MSPIKE_H2 -0.001 Average reputation (+2) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record X-Mailman-Approved-At: Fri, 07 Jun 2024 13:01:21 +0200 Subject: [pve-devel] [PATCH lxcfs 1/1] d/rules: Allow passing options to the lxcfs systemd unit X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Cc: Antonio Huete Jimenez Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Fixes: https://forum.proxmox.com/threads/45724 Signed-off-by: Antonio Huete --- 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 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 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel