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 DFBABB166 for ; Thu, 28 Apr 2022 16:57:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CD61F3370 for ; Thu, 28 Apr 2022 16:57:13 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 33AE53366 for ; Thu, 28 Apr 2022 16:57:13 +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 036C742FC6 for ; Thu, 28 Apr 2022 16:57:13 +0200 (CEST) From: Dylan Whyte To: pve-devel@lists.proxmox.com Date: Thu, 28 Apr 2022 16:57:06 +0200 Message-Id: <20220428145706.274322-1-d.whyte@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.265 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [vzdump.pm] Subject: [pve-devel] [PATCH pve-manager] vzdump: add error if passed in hook script doesn't exist 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, 28 Apr 2022 14:57:13 -0000 Previously, if the '--script' argument was passed with a non-existent file, it would state that a non-executable script was the reason for failure. This adds a check to see if the hook script exists, in order to provide a more accurate error message. Also adds an 'Error:' prefix the 'script not executable' error. Signed-off-by: Dylan Whyte --- PVE/VZDump.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index 80cbddb5..16e3e888 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -669,8 +669,12 @@ sub run_hook_script { my $script = $opts->{script}; return if !$script; + if (!-f $script) { + die "Error: The hook script '$script' does not exist.\n"; + } + if (!-x $script) { - die "The hook script '$script' is not executable.\n"; + die "Error: The hook script '$script' is not executable.\n"; } my $cmd = [$script, $phase]; -- 2.30.2