From b4fc345cae64c39df2edb757d6caed95bcac44ff Mon Sep 17 00:00:00 2001
From: Aaron Murray <plugins@omv-extras.org>
Date: Wed, 13 Dec 2023 11:49:51 -0600
Subject: [PATCH] check for apt-get update failure and remove proxmox repo list
 file

---
 fix6to7upgrade | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/fix6to7upgrade b/fix6to7upgrade
index 268122a..968964d 100755
--- a/fix6to7upgrade
+++ b/fix6to7upgrade
@@ -2,7 +2,7 @@
 #
 # shellcheck disable=SC1090,SC1091,SC1117,SC2016,SC2046,SC2086
 #
-# version: 0.0.1
+# version: 0.0.2
 #
 
 if [[ $(id -u) -ne 0 ]]; then
@@ -17,6 +17,10 @@ export LANG=C.UTF-8
 echo "Removing old sources ..."
 rm -f /etc/apt/sources.list.d/omvextras.list /etc/apt/sources.list.d/omv-extras-org.list
 
+if [ -f "/etc/apt/sources.list.d/pvekernel.list" ]; then
+  rm -fv /etc/apt/sources.list.d/pvekernel.list
+fi
+
 echo "Clearing cache ..."
 /usr/bin/salt-call --local saltutil.clear_cache
 omv-salt stage run prepare
@@ -48,6 +52,10 @@ fi
 
 echo "Running apt-get update ..."
 apt-get update
+if [ $? -gt 0 ]; then
+  echo "apt-get update failed.  Your repos need to be fixed."
+  exit 1
+fi
 
 echo "Running apt-get dist-upgrade ..."
 apt-get --yes \