Re: [pve-devel] [PATCH container v5 07/17] config: add entrypoint parameter

[Thomas Lamprecht <t.lamprecht@proxmox.com>]

Am 08.10.25 um 19:11 schrieb Filip Schauer:
> Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
> ---
> 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 => {

Wouldn't be 'init-cmd' a bit more fitting here? That would also align directly
with the underlying lxc config option. I can amend this, if you have no
objection.

> +        optional => 1,
> +        type => 'string',
> +        description => "Absolute path from container rootfs to the binary to use as init.",

should we enforce a regex like /\/.*/ to validate that it is indeed an
absolute path?

> +        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) = @_;
>  



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel