From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 5BD0B1FF183 for ; Wed, 8 Oct 2025 19:12:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B9F15E45C; Wed, 8 Oct 2025 19:12:17 +0200 (CEST) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Wed, 8 Oct 2025 19:10:13 +0200 Message-ID: <20251008171028.196998-8-f.schauer@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251008171028.196998-1-f.schauer@proxmox.com> References: <20251008171028.196998-1-f.schauer@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1759943503595 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.007 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 v5 07/17] 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 --- Changed since v2: * rebase onto newest master (5a8b3f962f16) and re-format with proxmox-perltidy 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 7a44547..546f4ee 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -593,7 +593,7 @@ __PACKAGE__->register_method({ ); } if ($init_cmd_str ne '/sbin/init') { - 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 diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index a445a85..5eaa57c 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -862,6 +862,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 1038fa7..56cb01c 100644 --- a/src/PVE/LXC/Config.pm +++ b/src/PVE/LXC/Config.pm @@ -638,6 +638,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', @@ -1861,6 +1867,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.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel