From af0770c33ffa6db29cc54e8127f16f5dfd9de125 Mon Sep 17 00:00:00 2001
From: Emmanuel Papin <manupap01@gmail.com>
Date: Sun, 7 Dec 2014 00:04:26 +0100
Subject: [PATCH] Use 'true' to prevent config script from dying and fix a bad
 variable name

---
 distros/debian8/zoneminder.config   | 6 +++---
 distros/debian8/zoneminder.postinst | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/distros/debian8/zoneminder.config b/distros/debian8/zoneminder.config
index 3f9df1be6..e13632872 100644
--- a/distros/debian8/zoneminder.config
+++ b/distros/debian8/zoneminder.config
@@ -40,14 +40,14 @@ if [ ! "$ZM_DB_TYPE" = "mysql" ]; then
 fi
 
 # Ask the user if the database shall be installed locally or remotely
-db_input high zoneminder/debconf_dblocation
+db_input high zoneminder/debconf_dblocation || true
 db_go || true
 db_get zoneminder/debconf_dblocation
 if [ "$RET" = "local" ]; then
     if [ ! -e "/usr/sbin/mysqld" ]; then
         # Display a message and exit if the user want a local database but no
         # database server is available
-        db_input high zoneminder/debconf_dblocalmissingerror
+        db_input high zoneminder/debconf_dblocalmissingerror || true
         db_go || true
         exit 1
     fi
@@ -65,7 +65,7 @@ else
         # dbc_remote_questions_default to true here but unfortunately this does
         # not work
         # https://bugs.launchpad.net/ubuntu/+source/dbconfig-common/+bug/1065331
-        db_input high zoneminder/debconf_dbconfigerror
+        db_input high zoneminder/debconf_dbconfigerror || true
         db_go || true
         exit 1
     fi
diff --git a/distros/debian8/zoneminder.postinst b/distros/debian8/zoneminder.postinst
index 43e199cab..d8d0085be 100644
--- a/distros/debian8/zoneminder.postinst
+++ b/distros/debian8/zoneminder.postinst
@@ -83,7 +83,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
     ADMIN_PASSWORD=${RET:-admin}
 
     # Get the lastest database version from dbconfig upgrade folder
-    DB_VERSION=$(ls -rv /usr/share/dbconfig-common/data/zoneminder/upgrade/$dbctypes | head -1)
+    DB_VERSION=$(ls -rv /usr/share/dbconfig-common/data/zoneminder/upgrade/$dbc_dbtypes | head -1)
 
     # Update the default admin account and database version
     mysql_update