From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <f.ebner@proxmox.com>
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 6256B69470
 for <pve-devel@lists.proxmox.com>; Mon, 13 Sep 2021 14:05:01 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id 506E329C3E
 for <pve-devel@lists.proxmox.com>; Mon, 13 Sep 2021 14:05:01 +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 3323E29C24
 for <pve-devel@lists.proxmox.com>; Mon, 13 Sep 2021 14:05:00 +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 E757B447A7
 for <pve-devel@lists.proxmox.com>; Mon, 13 Sep 2021 14:04:59 +0200 (CEST)
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Mon, 13 Sep 2021 14:04:46 +0200
Message-Id: <20210913120446.23392-5-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.353 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 proxmox-ve 3/3] apt hook: disallow major upgrade
 via virtual console from API/UI
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Mon, 13 Sep 2021 12:05:01 -0000

and adapt the output to avoid too much redundancy.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
 debian/apthook/pve-apt-hook | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/apthook/pve-apt-hook b/debian/apthook/pve-apt-hook
index 72a38ca..0eed6eb 100755
--- a/debian/apthook/pve-apt-hook
+++ b/debian/apthook/pve-apt-hook
@@ -77,11 +77,16 @@ while (my $line = <$fh>) {
       $log->("You are attempting to upgrade from proxmox-ve '$old' to proxmox-ve '$new'.\n");
       $log->("Please make sure to read the upgrade notes at\n");
       $log->("\thttps://pve.proxmox.com/wiki/Upgrade_from_6.x_to_7.0\n");
-      $log->("and that you are are connected directly via console or ssh (not the virtual\n");
-      $log->("console offered by the GUI!) before proceeding with this operation.\n");
+      $log->("and that you are are connected directly via console or ssh before proceeding\n");
+      $log->("with this operation.\n");
       $log->("\n");
-      $log->("Press enter to continue, or C^c to abort.\n");
-      $cleanup->(0, 1);
+      if ($ENV{PVE_API_SHELL}) {
+          $log->("Error: Refusing to carry out the major upgrade via GUI/API virtual console.\n");
+          $cleanup->(1);
+      } else {
+          $log->("Press enter to continue, or C^c to abort.\n");
+          $cleanup->(0, 1);
+      }
     }
   }
 }
-- 
2.20.1