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 11BE31FF17C for ; Wed, 11 Jun 2025 16:49:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 47193C0CD; Wed, 11 Jun 2025 16:49:21 +0200 (CEST) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Wed, 11 Jun 2025 16:48:57 +0200 Message-Id: <20250611144903.200940-6-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250611144903.200940-1-f.schauer@proxmox.com> References: <20250611144903.200940-1-f.schauer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.015 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 Subject: [pve-devel] [PATCH container v2 05/11] config: add entrypoint parameter 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Signed-off-by: Filip Schauer --- src/PVE/API2/LXC.pm | 2 +- src/PVE/LXC.pm | 2 ++ src/PVE/LXC/Config.pm | 12 ++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index 3b0ea35..cf93778 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -517,7 +517,7 @@ __PACKAGE__->register_method({ my $s = $_; $s =~ s/"/\\"/g; qq{"$_"} } @init_cmd); } - push @{$conf->{lxc}}, ['lxc.init.cmd', $init_cmd_str]; + $conf->{entrypoint} = $init_cmd_str; # An entrypoint other than /sbin/init breaks the tty console mode. # This is fixed by setting cmode: console $conf->{cmode} = 'console'; diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index 2b9f0cf..b2be27e 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -794,6 +794,8 @@ sub update_lxc_config { $raw .= "lxc.rootfs.path = $dir/rootfs\n"; + $raw .= "lxc.init.cmd = $conf->{entrypoint}\n" if defined($conf->{entrypoint}); + foreach my $k (sort keys %$conf) { next if $k !~ m/^net(\d+)$/; my $ind = $1; diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm index 49067ea..d7d8b6a 100644 --- a/src/PVE/LXC/Config.pm +++ b/src/PVE/LXC/Config.pm @@ -591,6 +591,12 @@ my $confdesc = { enum => ['shell', 'console', 'tty'], default => 'tty', }, + entrypoint => { + optional => 1, + type => 'string', + description => "Absolute path from container rootfs to the binary to use as init.", + default => '/sbin/init', + }, protection => { optional => 1, type => 'boolean', @@ -1745,6 +1751,12 @@ sub get_cmode { return $conf->{cmode} // $confdesc->{cmode}->{default}; } +sub get_entrypoint { + my ($class, $conf) = @_; + + return $conf->{entrypoint} // $confdesc->{entrypoint}->{default}; +} + sub valid_volume_keys { my ($class, $reverse) = @_; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel