Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

distros/ubuntu1204/zoneminder.dirs

@@ -4,3 +4,5 @@ var/cache/zoneminder/events
 var/cache/zoneminder/images
 var/cache/zoneminder/temp
 usr/share/zoneminder/db
+etc/zm
+etc/zm/conf.d

distros/ubuntu1204/zoneminder.postinst

@@ -14,6 +14,8 @@ if [ "$1" = "configure" ]; then
   fi
 
   # Do this every time the package is installed or upgraded
+  # Ensure zoneminder is stopped
+  invoke-rc.d zoneminder stop || true
 
   if [ "$ZM_DB_HOST" = "localhost" ]; then
     if [ -e "/etc/init.d/mysql" ]; then 
@@ -34,12 +36,8 @@ if [ "$1" = "configure" ]; then
           echo "grant lock tables, alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
         fi
 
-                # Ensure zoneminder is stopped
-                invoke-rc.d zoneminder stop || true
         zmupdate.pl --nointeractive
         zmupdate.pl --nointeractive -f
-                echo "Done Updating, starting ZoneMinder"
-                invoke-rc.d zoneminder start || true
       else
         echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'
       fi
@@ -49,6 +47,8 @@ if [ "$1" = "configure" ]; then
   else 
     echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)"
   fi
+  echo "Done Updating, starting ZoneMinder"
+  invoke-rc.d zoneminder start || true
 fi
 
 #DEBHELPER#

distros/ubuntu1604/zoneminder.postinst

@@ -21,6 +21,8 @@ if [ "$1" = "configure" ]; then
   # Ensure zoneminder is stopped
   deb-systemd-invoke stop zoneminder.service || exit $?
 
+  # Ensure zoneminder is stopped
+  deb-systemd-invoke stop zoneminder.service || exit $?
 	if [ "$ZM_DB_HOST" = "localhost" ]; then
 
     if [ -e "/etc/init.d/mysql" ]; then