From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 78B6E694CC for ; Mon, 13 Sep 2021 14:05:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 766C429C31 for ; Mon, 13 Sep 2021 14:05:00 +0200 (CEST) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id BEB2429C0C for ; Mon, 13 Sep 2021 14:04:59 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7C35A447C2 for ; Mon, 13 Sep 2021 14:04:59 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 13 Sep 2021 14:04:43 +0200 Message-Id: <20210913120446.23392-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210913120446.23392-1-f.ebner@proxmox.com> References: <20210913120446.23392-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.355 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 Subject: [pve-devel] [RFC manager 1/1] api: nodes: set environment variable for shells started via the API 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: , X-List-Received-Date: Mon, 13 Sep 2021 12:05:00 -0000 so that proxmox-ve's apt hook script can detect this. Signed-off-by: Fabian Ebner --- PVE/API2/Nodes.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm index e58d9c10..c57ad995 100644 --- a/PVE/API2/Nodes.pm +++ b/PVE/API2/Nodes.pm @@ -843,13 +843,13 @@ my $sslcert; my $shell_cmd_map = { 'login' => { - cmd => [ '/bin/login', '-f', 'root' ], + cmd => [ '/bin/login', '-f', 'root', 'PVE_API_SHELL=1' ], }, 'upgrade' => { - cmd => [ '/usr/bin/pveupgrade', '--shell' ], + cmd => [ '/usr/bin/env', 'PVE_API_SHELL=1', '/usr/bin/pveupgrade', '--shell' ], }, 'ceph_install' => { - cmd => [ '/usr/bin/pveceph', 'install' ], + cmd => [ '/usr/bin/env', 'PVE_API_SHELL=1', '/usr/bin/pveceph', 'install' ], allow_args => 1, }, }; @@ -866,11 +866,11 @@ sub get_shell_command { push @$cmd, split("\0", $args); } } else { - $cmd = [ '/bin/login', '-f', 'root' ]; + $cmd = [ '/bin/login', '-f', 'root', 'PVE_API_SHELL=1' ]; } } else { # non-root must always login for now, we do not have a superuser role! - $cmd = [ '/bin/login' ]; + $cmd = [ '/bin/login', 'PVE_API_SHELL=1' ]; } return $cmd; } -- 2.20.1