From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <t.lamprecht@proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 3B7588D73B for <pve-devel@lists.proxmox.com>; Tue, 8 Nov 2022 18:23:49 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 15189B0C3 for <pve-devel@lists.proxmox.com>; Tue, 8 Nov 2022 18:23:19 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for <pve-devel@lists.proxmox.com>; Tue, 8 Nov 2022 18:23:17 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A9E8342B1F for <pve-devel@lists.proxmox.com>; Tue, 8 Nov 2022 18:23:17 +0100 (CET) Message-ID: <a5d12f86-4a10-4d4f-067e-07defe050aa7@proxmox.com> Date: Tue, 8 Nov 2022 18:23:17 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:107.0) Gecko/20100101 Thunderbird/107.0 Content-Language: en-GB To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>, Leo Nunner <l.nunner@proxmox.com> References: <20220915115228.117543-1-l.nunner@proxmox.com> From: Thomas Lamprecht <t.lamprecht@proxmox.com> In-Reply-To: <20220915115228.117543-1-l.nunner@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.033 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [unmanaged.pm, base.pm, plugin.pm, alpine.pm, setup.pm, devuan.pm] Subject: [pve-devel] applied: [PATCH v3 container] fix #4192: revamp check for systemd version X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Tue, 08 Nov 2022 17:23:49 -0000 Am 15/09/2022 um 13:52 schrieb Leo Nunner: > Instead of iterating through several folders, it might just be easier to > check the objdump output of /sbin/init and getting the version from there. > Resolving the /sbin/init symlink happens inside the chroot, but the > objdump from the host system is used, as to not run any untrusted > executables. > > Signed-off-by: Leo Nunner <l.nunner@proxmox.com> > --- > I think putting the subroutine to resolve the /sbin/init symlink into > Setup.pm makes the most sense, since this isn't realy a task for the > plugin. > > src/PVE/LXC/Setup.pm | 18 +++++++++++++++++- > src/PVE/LXC/Setup/Alpine.pm | 2 +- > src/PVE/LXC/Setup/Base.pm | 34 ++++++++++++++++++---------------- > src/PVE/LXC/Setup/Devuan.pm | 2 +- > src/PVE/LXC/Setup/Plugin.pm | 2 +- > src/PVE/LXC/Setup/Unmanaged.pm | 2 +- > 6 files changed, 39 insertions(+), 21 deletions(-) > > applied, with a small followup for a few small white-space/indentation errors, otherwise nice work - thanks!