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 F124391374 for ; Thu, 6 Oct 2022 14:45:26 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CED191C662 for ; Thu, 6 Oct 2022 14:44:56 +0200 (CEST) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Thu, 6 Oct 2022 14:44:54 +0200 (CEST) Received: by lana.proxmox.com (Postfix, from userid 10043) id B81DB2C2069; Thu, 6 Oct 2022 14:44:48 +0200 (CEST) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Thu, 6 Oct 2022 14:44:40 +0200 Message-Id: <20221006124447.120701-2-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221006124447.120701-1-s.hanreich@proxmox.com> References: <20221006124447.120701-1-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.426 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [guesthelpers.pm] Subject: [pve-devel] [PATCH v2 pve-guest-common 1/1] Add run_params to exec_hookscript function 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: Thu, 06 Oct 2022 12:45:27 -0000 This enables us to pass parameters to the run_command call so the hookscripts have a more fine-grained control over how the script should get executed. Signed-off-by: Stefan Hanreich --- src/PVE/GuestHelpers.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PVE/GuestHelpers.pm b/src/PVE/GuestHelpers.pm index 0fe3fd6..79c02e2 100644 --- a/src/PVE/GuestHelpers.pm +++ b/src/PVE/GuestHelpers.pm @@ -101,7 +101,7 @@ sub check_hookscript { } sub exec_hookscript { - my ($conf, $vmid, $phase, $stop_on_error) = @_; + my ($conf, $vmid, $phase, $stop_on_error, $run_params) = @_; return if !$conf->{hookscript}; @@ -109,7 +109,7 @@ sub exec_hookscript { my $hookscript = check_hookscript($conf->{hookscript}); die $@ if $@; - PVE::Tools::run_command([$hookscript, $vmid, $phase]); + PVE::Tools::run_command([$hookscript, $vmid, $phase], %$run_params); }; if (my $err = $@) { my $errmsg = "hookscript error for $vmid on $phase: $err\n"; -- 2.30.2