[pve-devel] [PATCH container 6/9] config: add entrypoint parameter

[Filip Schauer]

Signed-off-by: Filip Schauer <f.scha...@proxmox.com>
---
 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 520b926..d4b074a 100644
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -509,7 +509,7 @@ __PACKAGE__->register_method({
                        push(@init_cmd, $oci_config->{Cmd}) if 
$oci_config->{Cmd};
                        if (@init_cmd) {
                            my $init_cmd_str = join(' ', @{ $init_cmd[0] });
-                           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