--- mythtv-setup.sh.orig	2016-01-03 19:59:29.264358040 +0100
+++ mythtv-setup.sh	2016-01-07 20:19:20.984348008 +0100
@@ -1,9 +1,34 @@
 #!/bin/sh
 # Mario Limonciello, March 2007
+# Mathieu Laurendeau, January 2016
 
 #source our dialog functions
 . /usr/share/mythtv/dialog_functions.sh
 
+#get database info
+getXmlParam() {
+  perl -e '
+    use XML::Simple;
+    use Data::Dumper;
+    $xml = new XML::Simple;
+    $data = $xml->XMLin("/etc/mythtv/config.xml");
+    print "$data->{Database}->{$ARGV[0]}\n";
+  ' -- "$1"
+}
+DBHost="$(getXmlParam Host)"
+DBUserName="$(getXmlParam UserName)"
+DBPassword="$(getXmlParam Password)"
+DBName="$(getXmlParam DatabaseName)"
+
+#get mythfilldatabase arguments
+mbargs=$(mysql -N \
+ --host="$DBHost" \
+ --user="$DBUserName" \
+ --password="$DBPassword" \
+ "$DBName" \
+ --execute="SELECT data FROM settings WHERE value = 'MythFillDatabaseArgs';" \
+)
+
 #find the session, dialog and su manager we will be using for display
 find_session
 find_dialog
@@ -46,7 +71,7 @@
 		dialog_question "Fill Database?" "Would you like to run mythfilldatabase?"
 		DATABASE_NOT=$?
 		if [ "$DATABASE_NOT" = "0" ]; then
-			xterm -title "Running mythfilldatabase" -e "unset DISPLAY && unset SESSION_MANAGER && mythfilldatabase; sleep 3"
+			xterm -title "Running mythfilldatabase" -e "unset DISPLAY && unset SESSION_MANAGER && mythfilldatabase $mbargs; sleep 3"
 		fi
 	fi
 fi