From 7b0c5194f5d3df90bbbbef2f5e2c20e44d680fbc Mon Sep 17 00:00:00 2001
From: szaimen <szaimen@e.mail.de>
Date: Wed, 14 Oct 2020 22:06:01 +0200
Subject: [PATCH] lvm snapshots - make snapshot failures a bit more informative
 (#1549)

---
 nextcloud_update.sh | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/nextcloud_update.sh b/nextcloud_update.sh
index 7a11e318..8842d947 100644
--- a/nextcloud_update.sh
+++ b/nextcloud_update.sh
@@ -44,7 +44,11 @@ if ! [ -f "$SCRIPTS/nextcloud-startup-script.sh" ] && (does_snapshot_exist "NcVM
 || does_snapshot_exist "NcVM-snapshot" || [ "$FREE_SPACE" -ge 50 ] )
 then
     SNAPSHOT_EXISTS=1
-    check_command systemctl stop docker
+    if is_docker_running
+    then
+        check_command systemctl stop docker
+        DOCKER=1
+    fi
     nextcloud_occ maintenance:mode --on
     if does_snapshot_exist "NcVM-startup"
     then
@@ -53,6 +57,13 @@ then
     then
         if ! lvremove /dev/ubuntu-vg/NcVM-snapshot -y
         then
+            nextcloud_occ maintenance:mode --off
+            if [ -n "$DOCKER" ]
+            then
+                check_command systemctl start docker
+            fi
+            notify_admin_gui "Update failed!" \
+"Could not remove NcVM-snapshot - Please reboot your server! $(date +%T)"
             msg_box "It seems like the old snapshot could not get removed.
 This should work again after a reboot of your server."
             exit 1
@@ -60,14 +71,23 @@ This should work again after a reboot of your server."
     fi
     if ! lvcreate --size 5G --snapshot --name "NcVM-snapshot" /dev/ubuntu-vg/ubuntu-lv
     then
+        nextcloud_occ maintenance:mode --off
+        if [ -n "$DOCKER" ]
+        then
+            check_command systemctl start docker
+        fi
+        notify_admin_gui "Update failed!" \
+"Could not create NcVM-snapshot - Please reboot your server! $(date +%T)"
         msg_box "The creation of a snapshot failed.
 If you just merged and old one, please reboot your server once more. 
 It should work afterwards again."
-        check_command systemctl start apache2.service
         exit 1
     fi
     nextcloud_occ maintenance:mode --off
-    check_command systemctl start docker
+    if [ -n "$DOCKER" ]
+    then
+        check_command systemctl start docker
+    fi
 fi
 
 # Check if /boot is filled more than 90% and exit the script if that's