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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 597BC93C97 for ; Wed, 22 Feb 2023 15:23:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3D0021995C for ; Wed, 22 Feb 2023 15:23:36 +0100 (CET) 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 for ; Wed, 22 Feb 2023 15:23:35 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 795BB48152 for ; Wed, 22 Feb 2023 15:23:35 +0100 (CET) From: Max Carrara To: pve-devel@lists.proxmox.com, m.carrara@proxmox.com Date: Wed, 22 Feb 2023 15:23:04 +0100 Message-Id: <20230222142304.93093-1-m.carrara@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.015 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] [PATCH manager] fix #4364: pveceph: add confirmation dialogue for ceph installation 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: Wed, 22 Feb 2023 14:23:36 -0000 Displays a confirmation dialogue if the user didn't explicitly provide a valid ceph version via the `--version` flag and if stdout is connected to a tty. Signed-off-by: Max Carrara --- PVE/CLI/pveceph.pm | 13 +++++++++++++ 1 file changed, 13 insertions(+) Note: This was tested in a VM, with and without --version flag. diff --git a/PVE/CLI/pveceph.pm b/PVE/CLI/pveceph.pm index afcc67e0..eaf7918e 100755 --- a/PVE/CLI/pveceph.pm +++ b/PVE/CLI/pveceph.pm @@ -157,6 +157,19 @@ __PACKAGE__->register_method ({ } else { die "unsupported ceph version: $cephver"; } + + if (-t STDOUT && !$param->{version}) { + my $title_case_cephver = $cephver =~ s/(.)(.*?)/\U$1\L$2/r ; + + print "This will install Ceph $title_case_cephver.\n" . + "Are you sure you want to proceed (yes/no)? "; + + my $answer = ; + my $valid = ($answer =~ m/^\s*yes\s*$/i) ? 1 : 0; + + die "Aborting installation.\n" if !$valid; + } + PVE::Tools::file_set_contents("/etc/apt/sources.list.d/ceph.list", $repolist); my $supported_re = join('|', $supported_ceph_versions->@*); -- 2.30.2