Merge branch 'master' into multi-server

distros/debian/postinst

@@ -15,7 +15,7 @@ if [ "$1" = "configure" ]; then
 			# test if database if already present...
 			if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
 				cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
-				echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+				echo 'grant lock tables, alter,select,insert,update,delete,create,index on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
 			fi
 
 			invoke-rc.d zoneminder stop || true
@@ -47,6 +47,8 @@ if [ "$1" = "configure" ]; then
 		chown www-data:www-data -R /var/cache/zoneminder
     else
 		chown www-data:www-data /var/log/zm
+
+		echo 'grant lock tables, create, index, alter on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
 		zmupdate.pl
 	fi
 fi

distros/ubuntu1504_cmake/zoneminder.postinst

@@ -8,6 +8,17 @@ if [ "$1" = "configure" ]; then
 		if [ -z "$2" ]; then
 			chown www-data:www-data -R /var/cache/zoneminder
 		fi
+
+	# Do this every time the package is installed or upgraded
+	# Test for database presence to avoid failure of zmupdate.pl
+
+    # Ensure zoneminder is stopped
+    deb-systemd-invoke stop zoneminder.service || exit $?
+
+	echo 'grant lock tables, create, index, alter on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+    # Run the ZoneMinder update tool
+    zmupdate.pl --nointeractive
+
 fi
 
 #DEBHELPER#