From 332702fe9eaf2db10c7bc2fdf840460e9c119623 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Sat, 23 Jan 2010 01:52:38 -0800
Subject: mythvantage for 0.22, latest mythtv

---
 abs/core-testing/LinHES-config-22/LinHES-release   |    1 -
 abs/core-testing/LinHES-config-22/LinHES.install   |   78 -
 abs/core-testing/LinHES-config-22/MythVantage.sh   |    3 -
 abs/core-testing/LinHES-config-22/PKGBUILD         |  100 -
 abs/core-testing/LinHES-config-22/README           |    9 -
 abs/core-testing/LinHES-config-22/add_service.sh   |   15 -
 abs/core-testing/LinHES-config-22/autocard.py      |  307 --
 abs/core-testing/LinHES-config-22/bpopup-ui.xml    |  164 -
 .../LinHES-config-22/build_diskless.sh             |  143 -
 .../LinHES-config-22/checkout_MythVantage.sh       |   49 -
 abs/core-testing/LinHES-config-22/create_master.sh |   57 -
 .../LinHES-config-22/file_time_offset.py           |   39 -
 abs/core-testing/LinHES-config-22/install-ui.xml   |  175 -
 .../LinHES-config-22/install_db_chroot.sh          |   63 -
 .../LinHES-config-22/install_functions.sh          |  344 --
 abs/core-testing/LinHES-config-22/install_proxy.sh |  234 -
 abs/core-testing/LinHES-config-22/issue            |    2 -
 abs/core-testing/LinHES-config-22/live-install.sh  |   28 -
 abs/core-testing/LinHES-config-22/mv_advanced.py   |  384 --
 abs/core-testing/LinHES-config-22/mv_common.py     |  201 -
 abs/core-testing/LinHES-config-22/mv_config.py     |   17 -
 abs/core-testing/LinHES-config-22/mv_ddns.py       |   26 -
 abs/core-testing/LinHES-config-22/mv_hostype.py    |  230 -
 abs/core-testing/LinHES-config-22/mv_install.py    | 1432 ------
 abs/core-testing/LinHES-config-22/mv_ir.py         |  330 --
 abs/core-testing/LinHES-config-22/mv_misc.py       |  180 -
 abs/core-testing/LinHES-config-22/mv_network.py    |  507 ---
 .../LinHES-config-22/mv_screensaver.py             |  199 -
 abs/core-testing/LinHES-config-22/mv_smolt.py      |   59 -
 abs/core-testing/LinHES-config-22/mv_software.py   |   61 -
 abs/core-testing/LinHES-config-22/mv_webuser.py    |   21 -
 abs/core-testing/LinHES-config-22/myth_user_call   |  174 -
 .../LinHES-config-22/myth_user_call.py             |  159 -
 abs/core-testing/LinHES-config-22/networkconfig.sh |  341 --
 .../LinHES-config-22/remove_service.sh             |    8 -
 .../LinHES-config-22/restore_default_settings.sh   |  362 --
 .../LinHES-config-22/restore_km_db_chroot.sh       |   61 -
 abs/core-testing/LinHES-config-22/soundconfig.sh   |  254 --
 abs/core-testing/LinHES-config-22/startx           |   29 -
 abs/core-testing/LinHES-config-22/systemconfig.py  |  244 --
 abs/core-testing/LinHES-config-22/systemconfig.sh  |   19 -
 abs/core-testing/LinHES-config-22/timezip.py       |  232 -
 abs/core-testing/LinHES-config-22/xconfig.sh       |  363 --
 abs/core-testing/LinHES-config/LinHES-release      |    2 +-
 abs/core-testing/LinHES-config/PKGBUILD            |   15 +-
 abs/core-testing/mythdb-initial/PKGBUILD           |   21 +
 abs/core-testing/mythdb-initial/__changelog        |   25 +
 abs/core-testing/mythdb-initial/mc.sql             | 2911 +++++++++++++
 abs/core-testing/mythdb-initial/mc.sql.21          | 2835 ++++++++++++
 abs/core-testing/mythdb-initial/mythdb.install     |   31 +
 abs/core-testing/mythdb-initial/permissions.sql    |   11 +
 abs/core-testing/mythinstall-22/PKGBUILD           |   28 -
 .../mythinstall-22/checkout_MythVantage.sh         |   49 -
 abs/core-testing/mythinstall/PKGBUILD              |   41 +-
 abs/core-testing/mythinstall/autocard.cpp          |  186 -
 abs/core-testing/mythinstall/autocard.h            |   30 -
 .../mythinstall/checkout_MythVantage.sh            |   49 +
 abs/core-testing/mythinstall/infrared.cpp          |  368 --
 abs/core-testing/mythinstall/infrared.h            |   45 -
 abs/core-testing/mythinstall/install-ui.xml        |  175 -
 abs/core-testing/mythinstall/install_proxy.sh      |  353 --
 abs/core-testing/mythinstall/installationtype.cpp  |  272 --
 abs/core-testing/mythinstall/installationtype.h    |   11 -
 abs/core-testing/mythinstall/installdialog.cpp     | 1034 -----
 abs/core-testing/mythinstall/installdialog.h       |  101 -
 abs/core-testing/mythinstall/installsettings.cpp   | 4556 --------------------
 abs/core-testing/mythinstall/installsettings.h     |  489 ---
 abs/core-testing/mythinstall/main.cpp              |  533 ---
 abs/core-testing/mythinstall/misc_settings.cpp     |  621 ---
 abs/core-testing/mythinstall/misc_settings.h       |   97 -
 abs/core-testing/mythinstall/mv_common.h           |    4 -
 abs/core-testing/mythinstall/mythinstall.pro       |   46 -
 abs/core-testing/mythinstall/password_manage.cpp   |  445 --
 abs/core-testing/mythinstall/password_manage.h     |   60 -
 abs/core-testing/mythinstall/settemplate.cpp       |  419 --
 abs/core-testing/mythinstall/settemplate.h         |   13 -
 abs/core-testing/mythinstall/statusbox.cpp         | 1411 ------
 abs/core-testing/mythinstall/statusbox.h           |   76 -
 abs/core-testing/mythinstall/xorgsettings.cpp      |  686 ---
 abs/core-testing/mythinstall/xorgsettings.h        |  178 -
 .../mythtv/stable-0.22/morethemes/PKGBUILD         |    4 +-
 abs/core-testing/mythtv/stable-0.22/mp_all.sh      |    4 +-
 .../mythtv/stable-0.22/mytharchive/PKGBUILD        |    4 +-
 .../mythtv/stable-0.22/mythbrowser/PKGBUILD        |    4 +-
 .../mythtv/stable-0.22/mythflix/PKGBUILD           |    4 +-
 .../mythtv/stable-0.22/mythgallery/PKGBUILD        |    4 +-
 .../mythtv/stable-0.22/mythgame/PKGBUILD           |    4 +-
 .../mythtv/stable-0.22/mythmovies/PKGBUILD         |    4 +-
 .../mythtv/stable-0.22/mythmusic/PKGBUILD          |    4 +-
 .../mythtv/stable-0.22/mythnews/PKGBUILD           |    4 +-
 .../mythtv/stable-0.22/myththemes/PKGBUILD         |    4 +-
 .../mythtv/stable-0.22/mythtv/PKGBUILD             |    4 +-
 .../mythtv/stable-0.22/mythvideo/PKGBUILD          |    4 +-
 .../mythtv/stable-0.22/mythweather/PKGBUILD        |    4 +-
 .../mythtv/stable-0.22/mythweb/PKGBUILD            |    4 +-
 .../mythtv/stable-0.22/mythzoneminder/PKGBUILD     |    4 +-
 96 files changed, 5932 insertions(+), 20063 deletions(-)
 delete mode 100644 abs/core-testing/LinHES-config-22/LinHES-release
 delete mode 100644 abs/core-testing/LinHES-config-22/LinHES.install
 delete mode 100755 abs/core-testing/LinHES-config-22/MythVantage.sh
 delete mode 100644 abs/core-testing/LinHES-config-22/PKGBUILD
 delete mode 100644 abs/core-testing/LinHES-config-22/README
 delete mode 100755 abs/core-testing/LinHES-config-22/add_service.sh
 delete mode 100755 abs/core-testing/LinHES-config-22/autocard.py
 delete mode 100755 abs/core-testing/LinHES-config-22/bpopup-ui.xml
 delete mode 100755 abs/core-testing/LinHES-config-22/build_diskless.sh
 delete mode 100755 abs/core-testing/LinHES-config-22/checkout_MythVantage.sh
 delete mode 100755 abs/core-testing/LinHES-config-22/create_master.sh
 delete mode 100755 abs/core-testing/LinHES-config-22/file_time_offset.py
 delete mode 100755 abs/core-testing/LinHES-config-22/install-ui.xml
 delete mode 100644 abs/core-testing/LinHES-config-22/install_db_chroot.sh
 delete mode 100755 abs/core-testing/LinHES-config-22/install_functions.sh
 delete mode 100755 abs/core-testing/LinHES-config-22/install_proxy.sh
 delete mode 100644 abs/core-testing/LinHES-config-22/issue
 delete mode 100755 abs/core-testing/LinHES-config-22/live-install.sh
 delete mode 100755 abs/core-testing/LinHES-config-22/mv_advanced.py
 delete mode 100755 abs/core-testing/LinHES-config-22/mv_common.py
 delete mode 100755 abs/core-testing/LinHES-config-22/mv_config.py
 delete mode 100755 abs/core-testing/LinHES-config-22/mv_ddns.py
 delete mode 100755 abs/core-testing/LinHES-config-22/mv_hostype.py
 delete mode 100755 abs/core-testing/LinHES-config-22/mv_install.py
 delete mode 100755 abs/core-testing/LinHES-config-22/mv_ir.py
 delete mode 100755 abs/core-testing/LinHES-config-22/mv_misc.py
 delete mode 100755 abs/core-testing/LinHES-config-22/mv_network.py
 delete mode 100755 abs/core-testing/LinHES-config-22/mv_screensaver.py
 delete mode 100755 abs/core-testing/LinHES-config-22/mv_smolt.py
 delete mode 100755 abs/core-testing/LinHES-config-22/mv_software.py
 delete mode 100755 abs/core-testing/LinHES-config-22/mv_webuser.py
 delete mode 100644 abs/core-testing/LinHES-config-22/myth_user_call
 delete mode 100755 abs/core-testing/LinHES-config-22/myth_user_call.py
 delete mode 100644 abs/core-testing/LinHES-config-22/networkconfig.sh
 delete mode 100755 abs/core-testing/LinHES-config-22/remove_service.sh
 delete mode 100755 abs/core-testing/LinHES-config-22/restore_default_settings.sh
 delete mode 100644 abs/core-testing/LinHES-config-22/restore_km_db_chroot.sh
 delete mode 100755 abs/core-testing/LinHES-config-22/soundconfig.sh
 delete mode 100755 abs/core-testing/LinHES-config-22/startx
 delete mode 100755 abs/core-testing/LinHES-config-22/systemconfig.py
 delete mode 100755 abs/core-testing/LinHES-config-22/systemconfig.sh
 delete mode 100755 abs/core-testing/LinHES-config-22/timezip.py
 delete mode 100755 abs/core-testing/LinHES-config-22/xconfig.sh
 create mode 100755 abs/core-testing/mythdb-initial/PKGBUILD
 create mode 100644 abs/core-testing/mythdb-initial/__changelog
 create mode 100644 abs/core-testing/mythdb-initial/mc.sql
 create mode 100644 abs/core-testing/mythdb-initial/mc.sql.21
 create mode 100755 abs/core-testing/mythdb-initial/mythdb.install
 create mode 100755 abs/core-testing/mythdb-initial/permissions.sql
 delete mode 100644 abs/core-testing/mythinstall-22/PKGBUILD
 delete mode 100755 abs/core-testing/mythinstall-22/checkout_MythVantage.sh
 delete mode 100755 abs/core-testing/mythinstall/autocard.cpp
 delete mode 100755 abs/core-testing/mythinstall/autocard.h
 create mode 100755 abs/core-testing/mythinstall/checkout_MythVantage.sh
 delete mode 100755 abs/core-testing/mythinstall/infrared.cpp
 delete mode 100755 abs/core-testing/mythinstall/infrared.h
 delete mode 100755 abs/core-testing/mythinstall/install-ui.xml
 delete mode 100755 abs/core-testing/mythinstall/install_proxy.sh
 delete mode 100755 abs/core-testing/mythinstall/installationtype.cpp
 delete mode 100755 abs/core-testing/mythinstall/installationtype.h
 delete mode 100755 abs/core-testing/mythinstall/installdialog.cpp
 delete mode 100755 abs/core-testing/mythinstall/installdialog.h
 delete mode 100755 abs/core-testing/mythinstall/installsettings.cpp
 delete mode 100755 abs/core-testing/mythinstall/installsettings.h
 delete mode 100755 abs/core-testing/mythinstall/main.cpp
 delete mode 100755 abs/core-testing/mythinstall/misc_settings.cpp
 delete mode 100755 abs/core-testing/mythinstall/misc_settings.h
 delete mode 100755 abs/core-testing/mythinstall/mv_common.h
 delete mode 100755 abs/core-testing/mythinstall/mythinstall.pro
 delete mode 100755 abs/core-testing/mythinstall/password_manage.cpp
 delete mode 100755 abs/core-testing/mythinstall/password_manage.h
 delete mode 100755 abs/core-testing/mythinstall/settemplate.cpp
 delete mode 100755 abs/core-testing/mythinstall/settemplate.h
 delete mode 100755 abs/core-testing/mythinstall/statusbox.cpp
 delete mode 100755 abs/core-testing/mythinstall/statusbox.h
 delete mode 100755 abs/core-testing/mythinstall/xorgsettings.cpp
 delete mode 100755 abs/core-testing/mythinstall/xorgsettings.h

diff --git a/abs/core-testing/LinHES-config-22/LinHES-release b/abs/core-testing/LinHES-config-22/LinHES-release
deleted file mode 100644
index 6a885f4..0000000
--- a/abs/core-testing/LinHES-config-22/LinHES-release
+++ /dev/null
@@ -1 +0,0 @@
-LinHES R6.01.00 (Chugu)
diff --git a/abs/core-testing/LinHES-config-22/LinHES.install b/abs/core-testing/LinHES-config-22/LinHES.install
deleted file mode 100644
index a0a9d31..0000000
--- a/abs/core-testing/LinHES-config-22/LinHES.install
+++ /dev/null
@@ -1,78 +0,0 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-pre_install() {
-  rm -f /etc/issue
-  rm -f /etc/arch-release
-
-}
-
-# arg 1:  the new package version
-post_install() {
-    if [ ! -f /etc/blacklist.package ]
-    then
-        echo "List of packages to ignore" > /etc/blacklist.package
-        echo "one package per line" >> /etc/blacklist.package
-    fi
-
-LINE="mythtv    ALL = NOPASSWD:/usr/MythVantage/bin/mythvantage"
-LINE1="mythtv   ALL = NOPASSWD:/usr/MythVantage/bin/MythVantage"
-for i in "$LINE"  "$LINE1"
-do
-        cp /etc/sudoers /etc/sudoers.bak
-        grep -q "$i" /etc/sudoers
-        if [ $? != 0 ]
-        then
-                echo  "$i" >> /etc/sudoers
-                visudo -cf /etc/sudoers
-                if [ ! $? = 0 ]
-                then
-                        cp /etc/sudoers.bak /etc/sudoers
-			echo $i
-                        echo "Error adding files"
-                        exit 1
-                fi
-        fi
-done
-
-
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  /bin/true
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	. /etc/profile
-	ps -ef|grep mysqld|grep -v grep
-	status=$?
-	echo "status $status"
-	if [ $status  = 0 ]
-	then
- 		restore_default_settings.sh -c load
-	fi
-        if [ ! -f /etc/blacklist.package ]
-        then
-            echo "List of packages to ignore" > /etc/blacklist.package
-            echo  "one package per line" >> /etc/blacklist.package
-        fi
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/core-testing/LinHES-config-22/MythVantage.sh b/abs/core-testing/LinHES-config-22/MythVantage.sh
deleted file mode 100755
index 286c908..0000000
--- a/abs/core-testing/LinHES-config-22/MythVantage.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-export MV_ROOT=/usr/MythVantage
-export PATH=$PATH:$MV_ROOT/bin
-export TEMPLATES=$MV_ROOT/templates
diff --git a/abs/core-testing/LinHES-config-22/PKGBUILD b/abs/core-testing/LinHES-config-22/PKGBUILD
deleted file mode 100644
index 145a633..0000000
--- a/abs/core-testing/LinHES-config-22/PKGBUILD
+++ /dev/null
@@ -1,100 +0,0 @@
-pkgname=LinHES-config-22
-pkgver=2.1
-pkgrel=9
-conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
-pkgdesc="Install and configure your system"
-depends=(bc libstatgrab  mysql-python expect curl dnsutils parted 
-	 sg3_utils nmbscan system-templates rsync python-parted 
-	 ddcxinfo python-pexpect python-netifaces LinHES-timezone 
-	 python-iplib mythinstall-22)
-arch=('i686')
-
-source=(mv_install.py 
-	mv_config.py 
-	myth_user_call 
-	file_time_offset.py 
-	install_proxy.sh 
-	install_functions.sh 
-	systemconfig.sh 
-	install_db_chroot.sh 
-	restore_default_settings.sh 
-	xconfig.sh 
-	timezip.py 
-	soundconfig.sh 
-	LinHES-release 
-	issue 
-	MythVantage.sh 
-	create_master.sh 
-	build_diskless.sh 
-	networkconfig.sh 
-	autocard.py 
-	restore_km_db_chroot.sh 
-	README 
-	mv_advanced.py 
-	mv_common.py 
-	mv_ddns.py 
-	mv_ir.py 
-	mv_misc.py 
-	mv_network.py 
-	mv_screensaver.py 
-	mv_smolt.py 
-	mv_software.py 
-	mv_webuser.py 
-	mv_hostype.py 
-	systemconfig.py 
-	myth_user_call.py)
-
-install=LinHES.install
-
-build() {
-    mkdir -p $startdir/pkg/etc
-    mkdir -p $startdir/pkg/usr/share/mythtv/themes/default
-
-    MVDIR=$startdir/pkg/usr/MythVantage
-    mkdir  $startdir/pkg/etc/profile.d
-    install -m 0755 MythVantage.sh  $startdir/pkg/etc/profile.d/MythVantage.sh
-    mkdir -p $MVDIR/bin
-    mkdir -p $MVDIR/etc
-
-    #copy in all the installer specific stuff
-#    install -m0700 myth_user_call  $MVDIR/bin/myth_user_call
-    install -m0700 myth_user_call.py $MVDIR/bin/myth_user_call
-    install -m 0755 install_proxy.sh  $MVDIR/bin/install_proxy.sh
-    install -m 0755 install_functions.sh  $MVDIR/bin/install_functions.sh
-    install -m 0755 systemconfig.sh  $MVDIR/bin/systemconfig.sh
-    install -m 0755 xconfig.sh  $MVDIR/bin/xconfig.sh
-    install -m 0755 install_db_chroot.sh $MVDIR/bin/install_db_chroot.sh
-    install -m 0755 restore_km_db_chroot.sh $MVDIR/bin/restore_km_db_chroot.sh
-    install -m 0755 restore_default_settings.sh $MVDIR/bin/restore_default_settings.sh
-    install -m 0755 soundconfig.sh $MVDIR/bin/soundconfig.sh
-    install -m 0755 networkconfig.sh $MVDIR/bin/networkconfig.sh
-    install -m 0755 create_master.sh $MVDIR/bin/create_master.sh
-    install -m 0755 build_diskless.sh $MVDIR/bin/build_diskless.sh
-    install -m 0755 timezip.py $MVDIR/bin/timezip.py
-    install -m 0755 autocard.py $MVDIR/bin/autocard.py
-    install -m 0755 mv_config.py $MVDIR/bin/mv_config.py
-    install -m 0755 mv_install.py $MVDIR/bin/mv_install.py
-    install -m 0755 mv_advanced.py  $MVDIR/bin/
-    install -m 0755 mv_common.py $MVDIR/bin/ 
-    install -m 0755 mv_ddns.py  $MVDIR/bin/ 
-    install -m 0755 mv_ir.py  $MVDIR/bin/ 
-    install -m 0755 mv_misc.py  $MVDIR/bin/ 
-    install -m 0755 mv_network.py  $MVDIR/bin/ 
-    install -m 0755 mv_screensaver.py  $MVDIR/bin/ 
-    install -m 0755 mv_smolt.py  $MVDIR/bin/ 
-    install -m 0755 mv_software.py  $MVDIR/bin/ 
-    install -m 0755 mv_webuser.py $MVDIR/bin/ 
-    install -m 0755 mv_hostype.py $MVDIR/bin/ 
-    install -m 0755 systemconfig.py $MVDIR/bin/ 
-
-    #README file displayed on install
-    install -m 0755 README $MVDIR/README
-
-    mkdir -p $startdir/pkg/usr/bin
-    install -m 0755 file_time_offset.py $startdir/pkg/usr/bin/file_time_offset.py
-
-    #Copy in the branding stuff
-    install -m 0755 LinHES-release $startdir/pkg/etc/LinHES-release
-    install -m 0755 issue $startdir/pkg/etc/issue
-
-}
diff --git a/abs/core-testing/LinHES-config-22/README b/abs/core-testing/LinHES-config-22/README
deleted file mode 100644
index 447678a..0000000
--- a/abs/core-testing/LinHES-config-22/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Thanks for choosing LinHES!  At the moment, LinHES is compiled for i686. 
-If you have an i586 class system, LinHES won't work for you.  I've not seen a great request for i586.  If you want it, you have to drum up support for it.  The PVR-350 TV out isn't supported at this time.  I have to determine if it works with MythTV 0.22 first.
-
-Support for LinHES can be obtained at:
-http://linhes.org
-irc.freenode.net #linhes
- 
-Bugs can be reported at:
-http://linhes.org/flyspray
diff --git a/abs/core-testing/LinHES-config-22/add_service.sh b/abs/core-testing/LinHES-config-22/add_service.sh
deleted file mode 100755
index 190d604..0000000
--- a/abs/core-testing/LinHES-config-22/add_service.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-SERVICE_DIR=/var/service
-SCRIPT_DIR=/etc/sv
-if [ -d $SCRIPT_DIR/$1 ]
-then
-        if [  -d $SERVICE_DIR/$1 ]
-        then
-                echo "$1 already there"
-        else
-               ln -s $SCRIPT_DIR/$1 $SERVICE_DIR/$1
-              echo "adding $1"
-	fi
-else
-	echo "couldn't find $SCRIPT_DIR/$1"
-fi
diff --git a/abs/core-testing/LinHES-config-22/autocard.py b/abs/core-testing/LinHES-config-22/autocard.py
deleted file mode 100755
index 03eecac..0000000
--- a/abs/core-testing/LinHES-config-22/autocard.py
+++ /dev/null
@@ -1,307 +0,0 @@
-#!/usr/bin/python
-# import MySQL module
-#jm
-import MySQLdb
-import sys
-import getopt
-import socket
-import os
-import time
-import string
-import glob
-from string import letters
-from string import digits
-def INSERTNULL_SOURCE(name,xmltvgrabber,userid,freqtable,lineupid,password,useeit):
-    cursor = db.cursor()
-    cursor.execute("INSERT INTO videosource(name,xmltvgrabber,userid,freqtable,lineupid,password,useeit) VALUES(%s,%s,%s,%s,%s,%s,%s);",(name,xmltvgrabber,userid,freqtable,lineupid,password,useeit))
-
-def INSERTCARD_INTOMYTH(Device,Driver,Cardvendor):
-    global currenthostname
-    print Device
-    print Driver,
-    print Cardvendor
-    cursor = db.cursor()
-    insert = "false"
-    if Driver == "ivtv" :
-        cardtype="MPEG"
-        defaultinput="Tuner 1"
-        insert="true"
-    if Cardvendor ==  "pcHDTV HD3000 HDTV":
-        insert="false"
-        cardtype ="whocares"
-
-        #print insert
-    if insert == "true" :
-        cursor.execute("INSERT INTO capturecard (videodevice,cardtype,defaultinput,hostname) VALUES(%s,%s,%s,%s);",(Device,cardtype,defaultinput,currenthostname))
-
-def INSERTHDR_INTOMYTH(deviceid,tuner_number):
-    cardtype='HDHOMERUN'
-    defaultinput='MPEG2TS'
-    global currenthostname
-    print deviceid
-    print cardtype
-    print defaultinput
-    print tuner_number
-    cursor = db.cursor()
-   #print insert
-    cursor.execute("INSERT INTO capturecard (videodevice,cardtype,defaultinput,dbox2_port ,hostname) VALUES(%s,%s,%s,%s,%s);",(deviceid,cardtype,defaultinput,tuner_number,currenthostname))
-
-def INSERTAUTOCARD():
-    global cardlist
-    global currenthostname
-    # create a cursor
-    cursor = db.cursor()
-
-
-    for i in range( 1 , len(cardlist)):
-        insert = "false"
-#        print cardlist[i]
-        Device=cardlist[i][0]
-        Driver=cardlist[i][1]
-        Cardvendor=cardlist[i][2]
-        Businfo=cardlist[i][3]
-        if Driver == "ivtv" :
-            insert="true"
-            devicestatus="unused"
-        if Cardvendor ==  "pcHDTV HD3000 HDTV":
-            insert="false"
-            cardtype ="whocares"
-        if Driver == "hdr":
-            insert="true"
-            devicestatus="unused"
-
-        if insert == "true" :
-            cursor.execute("delete from autocard where uniqid=%s;",(Businfo))
-            if Driver=="hdr":
-                Cardvendor="HDHOMERUN Tuner 1"
-                cursor.execute("INSERT INTO autocard (dev,driver,description,uniqid,devicestatus,hostname) VALUES(%s,%s,%s,%s,%s,%s);",(Device,Driver,Cardvendor,Businfo,devicestatus,currenthostname))
-                Cardvendor="HDHOMERUN Tuner 2"
-                cursor.execute("INSERT INTO autocard (dev,driver,description,uniqid,devicestatus,hostname) VALUES(%s,%s,%s,%s,%s,%s);",(Device,Driver,Cardvendor,Businfo,devicestatus,currenthostname))
-
-            else:
-                cursor.execute("INSERT INTO autocard (dev,driver,description,uniqid,devicestatus,hostname) VALUES(%s,%s,%s,%s,%s,%s);",(Device,Driver,Cardvendor,Businfo,devicestatus,currenthostname))
-
-
-
-def PRINTINFO():
-    global cardlist
-
-    for list in cardlist:
-        if  list != "_placeholder_":
-            print list
-            #print "-------------"
-
-def GATHER_HDR():
-    global cardlist
-    command="/usr/bin/hdhomerun_config --discover"
-    results=os.popen(command,'r')
-    line=results.readline()
-    if line.strip().split()[0] == "no":
-        print "HDHOMERUN not detected"
-    else:
-        print line
-        hdrdevice=line.strip().split()[2]
-        print hdrdevice
-        Driver="hdr"
-        Device=hdrdevice
-        Cardtype="HDHOMERUN"
-        Businfo=hdrdevice
-        cardprops =  [Device,Driver , Cardtype , Businfo]
-        cardlist.append(cardprops)
-
-
-def GATHER_v4l_CARDS():
-    global cardlist
-    cardlist=["_placeholder_"]
-   # print "Looking for v4l cards"
-    try:
-        filelist = os.listdir('/dev/v4l/')
-    except OSError:
-        filelist=" "
-        #fakelist=['/dev/v4l/video3', 'ivtv', 'WinTV PVR 500 (unit #2)', '0000:04:09.0']
-        #cardlist.append(fakelist)
-    try:
-        filelist = glob.glob("/dev/v4l/video?")
-        Driver=""
-        Cardtype=""
-        Businfo=""
-        numcards  = 0
-        for Device in filelist:
-            #print card
-            numcards = numcards+1
-            cmd = 'v4l2-ctl -D -d' + Device
-            for line in os.popen(cmd).readlines():
-                #print line
-                pos = string.find(line,"Driver name")
-                if pos >=0:
-                    splitline= line.split(':')
-                    Driver=splitline[1].strip()
-                pos = string.find(line,"Card type")
-                if pos >=0:
-                    splitline= line.split(':')
-                    Cardtype=splitline[1].strip()
-
-                pos = string.find(line,"Bus info")
-                if pos >=0:
-                    splitline= line.split(':',1)
-                    Businfo=splitline[1].strip()
-
-            #print Device,Driver , Cardtype , Businfo,numcards
-            cardprops =  [Device,Driver , Cardtype , Businfo]
-            cardlist.append(cardprops)
-    except IOError:
-        print "no v4l cards found"
-        sys.exit(2)
-
-
-def WRITEUDEV_IVTV():
-    global insertmyth
-    cursor = db.cursor()
-    #add ivtv,cid lookup loop through until empty.
-    cursor.execute("select distinct(uniqid) from autocard where driver='ivtv' and devicestatus='will-add'")
-    cidrows = cursor.fetchall()
-    for row in cidrows:
-        cid=row[0]
-        cursor.execute("select dev,driver,description,devicestatus,hostname from  autocard where uniqid=%s limit 1;",(cid))
-        result = cursor.fetchone()
-        description=result[2]
-        driver='DRIVERS==\"ivtv\"'
-        ATTRNAME='ATTR{name}=="ivtv? encoder MPG"'
-        KERNELS='KERNELS==\"'
-        KERNELS+=cid
-        KERNELS+="\""
-        #filter out non digit or chars
-        keep=letters.join(digits)
-        description=filter(lambda c: c in keep, description)
-        devnode="ivtv/"
-        #devnode+=description + "_"
-        udevcid=cid.partition(":")
-        devnode+=udevcid[2]
-        devnode+="_video"
-        UDEV_RULE=driver +', '+ATTRNAME+', '+ KERNELS +', ' + 'NAME=\"' + devnode + '"'
-        print "Here is the udev rule"
-        print UDEV_RULE
-        filename='/etc/udev/rules.d/11-ivtv-'+cid+'.rules'
-        file = open(filename,'w')
-        file.write(UDEV_RULE)
-        if ( insertmyth == "true"):
-            devnode="/dev/"+devnode
-            INSERTCARD_INTOMYTH(devnode,"ivtv",description)
-            cursor.execute("update autocard set devicestatus='done' where uniqid=%s;",(cid))
-#now insert HDR
-    cursor.execute("select distinct(uniqid),description from autocard where driver='hdr' and devicestatus='will-add'")
-    cidrows = cursor.fetchall()
-    for row in cidrows:
-              if ( insertmyth == "true"):
-                  deviceid=row[0]
-                  #cardtype="HDHOMRUN"
-                  #defaultinput="MPEG2TS"
-                  dbox2_port=row[1]
-                  tuner_number=dbox2_port.rpartition(' ')[2]
-                  INSERTHDR_INTOMYTH(deviceid,tuner_number)
-                  cursor.execute("update autocard set devicestatus='done' where uniqid=%s and description=%s;",(deviceid,dbox2_port))
-
-
-
-def CLEARAUTOCARD():
-    cursor = db.cursor()
-    cursor.execute("delete from autocard")
-
-def RELOADUDEV():
-        print "relaoding udev rules"
-        os.system('udevcontrol reload_rules')
-        os.system('rmmod ivtv')
-        os.system('udevtrigger')
-
-
-def usage():
-    print " -h   help"
-    print " -g   gather and print out the found cards"
-    print " -w   write out the udev rules"
-    print " -i   insert cards into myth that are marked will-add(only used with -w)"
-    print " -r   reload udev rules"
-    print " -c   clear the autocard db"
-
-def main(argv):
-    global db
-    global cardlist
-    global currenthostname
-    currenthostname=""
-    writeudev="false"
-    global insertmyth
-    insertmyth ="false"
-
-    db = MySQLdb.connect(host="localhost", user="mythtv", passwd="[REDACTED] db="mythconverg")
-    try:
-        cursor = db.cursor()
-        cursor.execute("describe autocard;")
-    except  MySQLdb.Error, e:
-        cursor.execute("create table autocard(dev varchar(50),driver varchar(50),description varchar(50),uniqid varchar(50), devicestatus varchar(50),hostname varchar(50));")
-        print "table created"
-
-    if ( currenthostname == "" ):
-         currenthostname = socket.gethostname()
-
-
-    try:
-        opts, args = getopt.getopt(argv, "hgwircd", ["help", "gathercards",  "writeudev" ,"insert" , "reloadudev" , "clearautocard"] )
-    except getopt.GetoptError:
-        sys.exit(2)
-    for opt, arg in opts:
-        if opt in ("-h", "--help"):
-             usage()
-             sys.exit()
-        elif opt in ( "-g" , "--gathercards"):
-             GATHER_v4l_CARDS()
-             GATHER_HDR()
-             INSERTAUTOCARD()
-             PRINTINFO()
-        elif opt in ("-w", "--writeudev"):
-             writeudev="true"
-        elif opt in ("-i", "--insert"):
-             insertmyth="true"
-        elif opt in ( "-r" , "--reloadudev"):
-             RELOADUDEV()
-        elif opt in ( "-c" , "--clearautocard"):
-             CLEARAUTOCARD()
-        elif opt in ( "-d" ):
-             INSERTCARD_INTOMYTH("file:/myth/video/TripThe1939.mpeg","ivtv","Dummy tuner")
-             INSERTNULL_SOURCE("dummy","/bin/true","","default","NULL","NULL","0")
-
-    if ( writeudev == "true"):
-        WRITEUDEV_IVTV()
-
-
-
-
-
-
-if __name__ == "__main__":
-    main(sys.argv[1:])
-
-
-
-
-
-#mysql>  create table autocard(dev varchar(50),driver varchar(50),description varchar(50),uniqid varchar(50), devicestatus varchar(50),hostname varchar(50));
-#Query OK, 0 rows affected (0.14 sec)
-
-#mysql> describe autocard;
-#+--------------+-------------+------+-----+---------+-------+
-#| Field        | Type        | Null | Key | Default | Extra |
-#+--------------+-------------+------+-----+---------+-------+
-#| dev          | varchar(50) | YES  |     | NULL    |       |
-#| driver       | varchar(50) | YES  |     | NULL    |       |
-#| description  | varchar(50) | YES  |     | NULL    |       |
-#| uniqid       | varchar(50) | YES  |     | NULL    |       |
-#| devicestatus | varchar(50) | YES  |     | NULL    |       |
-#| hostname     | varchar(50) | YES  |     | NULL    |       |
-#+--------------+-------------+------+-----+---------+-------+
-
-
-
-
-
-
-
-
diff --git a/abs/core-testing/LinHES-config-22/bpopup-ui.xml b/abs/core-testing/LinHES-config-22/bpopup-ui.xml
deleted file mode 100755
index df0598b..0000000
--- a/abs/core-testing/LinHES-config-22/bpopup-ui.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<!--
-
-    This is a myth style theme file for mythwelcome
-
-    (c) 2005 by a whole bunch of people associated with MythTV
-
--->
-<mythuitheme>
- 
-    <window name="welcome_screen">
-    
-        <!--
-
-            First, define all the fonts we need on this screen
-
-        -->
-       <font name="title" face="Arial">
-           <color>#ffff00</color>
-           <dropcolor>#000000</dropcolor>
-           <size>24</size>
-           <shadow>3,3</shadow>
-           <bold>yes</bold>
-       </font>
-
-       <font name="time" face="Arial">
-            <color>#9999cc</color>
-            <size>18</size>
-            <bold>yes</bold>
-       </font>
-
-       <font name="label" face="Arial">
-            <color>#ffff00</color>
-            <dropcolor>#000000</dropcolor>
-            <size>18</size>
-            <shadow>3,3</shadow>
-            <bold>yes</bold>
-       </font>
-
-       <font name="info" face="Arial">
-            <color>#ffffff</color>
-            <size>18</size>
-            <bold>yes</bold>
-       </font>
-       
-       <font name="biginfo" face="Arial">
-	       <color>#ffffff</color>
-	       <size>50</size>
-	       <bold>yes</bold>
-       </font>
-       <font name="warning" face="Arial">
-            <color>#ff0000</color>
-            <dropcolor>#000000</dropcolor>
-            <size>16</size>
-            <shadow>2,2</shadow>
-            <bold>yes</bold>
-       </font>
-
-       <font name="buttons" face="Arial">
-            <color>#ffff00</color>
-            <size>14</size>
-            <bold>yes</bold>
-       </font>
-
-       <container name="main_display">
-            <area>0,0,800,600</area>
-
-            <textarea name="title" draworder="0" align="center">
-                <multiline>no</multiline>
-                <font>title</font>
-                <area>50,40,700,40</area>
-                <value></value>
-            </textarea>
-
-            <!-- 
-                time
-            -->            
-            <textarea name="time_text" draworder="0" align="right">
-                <multiline>no</multiline>
-                <font>time</font>
-                <area>660,520,110,30</area>
-                <value></value>
-            </textarea>
-
-            <textarea name="date_text" draworder="0" align="center">
-                <multiline>no</multiline>
-                <font>time</font>
-                <area>0,60,800,70</area>
-                <value></value>
-            </textarea>
-            
-            <!-- 
-                current myth status
-            -->
-
-            <textarea name="status_text" draworder="1" align="center">
-                <multiline>yes</multiline>
-                <font>info</font>
-                <area>20,70,760,60</area>
-                <value>MythTV is idle and will shutdown shortly.</value>
-            </textarea>
-
-            <!-- 
-                current recordings status
-            -->
-            
-            <textarea name="recording_label" draworder="1" align="center">
-                <font>label</font>
-                <area>20,110,760,30</area>
-                <!--<value>Percent Complete </value>-->
-                 <value></value>
-            </textarea>
-
-            <textarea name="recording_text" draworder="1" align="hcenter">
-                <multiline>yes</multiline>
-                <font>biginfo</font>
-                <area>20,110,760,150</area>
-                <value></value>
-            </textarea>
-
-            <!-- 
-                next scheduled recording status
-            -->
-            
-            <textarea name="scheduled_label" draworder="1" align="center">
-                <font>label</font>
-                <area>20,320,760,30</area>
-                <value></value>
-            </textarea>
-
-            <textarea name="scheduled_text" draworder="1" align="hcenter">
-                <multiline>yes</multiline>
-                <font>biginfo</font>
-                <area>20,400,760,120</area>
-                <value></value>
-            </textarea>
-
-            <!-- 
-                scheduled recordings conflict warning
-            -->
-            
-            <textarea name="conflicts_text" draworder="1" align="center">
-                <font>warning</font>
-                <area>20,490,760,30</area>
-                <value>WARNING: There are conflicting scheduled recordings!</value>
-            </textarea>
-
-            <!-- 
-                start frontend button
-                     
-            <textbutton name="startfrontend_button" draworder="1">
-                <position>81,535</position>
-                <font>buttons</font>
-                <image function="on" filename="mw_text_button_on.png"></image>
-                <image function="off" filename="mw_text_button_off.png"></image>
-                <image function="pushed" filename="mw_text_button_pushed.png"></image>
-            </textbutton>
-
-            -->
-
-	   </container>
-    
-    </window>
-    
-</mythuitheme>
diff --git a/abs/core-testing/LinHES-config-22/build_diskless.sh b/abs/core-testing/LinHES-config-22/build_diskless.sh
deleted file mode 100755
index 4dfd5fc..0000000
--- a/abs/core-testing/LinHES-config-22/build_diskless.sh
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/bash
-#CD=/mnt/cd
-. /etc/profile
-. /etc/systemconfig
-
-TFTP=/data/srv/tftp
-CD=/data/srv/tftp/live
-DESTCD=/data/srv/tftp/CD
-BASE=/data/srv/tftp/masterbuild
-
-MODULES=$DESTCD/MythVantage/base/
-myip=`ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'|head -n1`
-SRCFILES=$BASE/mnt/live/mnt/MythVantage/base/
-
-function log () {
-echo $1
-}
-
-function check_xvfb () {
-export    DISPLAY=127.0.0.1:25
- Xvfb -ac :25  &
-
-}
-
-
-function create_base_image() {
-echo $SRCFILES
-if [ -f $SRCFILES/data.lzm ]
-then
-    mkdir $HOST_IMG_DIR
-    cd $SRCFILES
-    echo "Creating image.." > $BASE/tmp/.install_state
-    LIST=`ls *.lzm`
-    for i in  $LIST
-    do
-       echo  $i
-       echo  $i > $BASE/tmp/.install_percent
-       lzm2dir $i \/$HOST_IMG_DIR
-    done
-
-    for i in sys proc dev tmp
-    do
-         mkdir /$HOST_IMG_DIR/$i
-    done
-
-    chmod 777 /$HOST_IMG_DIR/tmp
-    mknod /$HOST_IMG_DIR/dev/null c 1 3
-    mknod /$HOST_IMG_DIR/dev/null c 1 5
-    mknod /$HOST_IMG_DIR/dev/console c 5 1
-    chmod +s /$HOST_IMG_DIR/usr/bin/Xorg
-    chmod +s /$HOST_IMG_DIR/usr/bin/crontab
-    chmod +s /$HOST_IMG_DIR/usr/bin/sudo
-    chmod +s /$HOST_IMG_DIR/bin/mount
-    #copy fstab from masterbuild
-    cp -f $BASE/etc/fstab /$HOST_IMG_DIR/etc/fstab
-    echo "Done: installing data" > $BASE/tmp/.install_state
-    return 0
-else
-    echo "Error: no modules" > $BASE/tmp/.install_state
-    log "couldn't find modules to install"
-    return 1
-fi
-}
-
-function configure_image () {
-    echo "Configuring system" > $BASE/tmp/.install_state
-    cp -f $BASE/etc/systemconfig  $HOST_IMG_DIR/etc/systemconfig
-    chown root:mythtv $HOST_IMG_DIR/etc/systemconfig
-    chmod 775 "$HOST_IMG_DIR" /etc/systemconfig
-    cp /etc/mtab $HOST_IMG_DIR/etc/mtab
-     mount --bind /dev $HOST_IMG_DIR/dev
-
-    chroot "$HOST_IMG_DIR" $MV_ROOT/bin/systemconfig.sh misc,hostype,network,this_is_install
-#copy syssettings template to here.
-    SE=$BASE$TEMPLATES/settings/syssettings
-    mkdir -p  $HOST_IMG_DIR/$TEMPLATES/settings/syssettings
-    cp -rp $SE/*  ${HOST_IMG_DIR}/$TEMPLATES/settings/syssettings
-    chown root:mythtv $HOST_IMG_DIR/etc/systemconfig
-    chown -R mythtv:mythtv $HOST_IMG_DIR/$TEMPLATES/settings/syssettings
-    chmod -R 775  $HOST_IMG_DIR/$TEMPLATES/settings/syssettings
-#update remotedb with this host settings
-    OLDDISPLAY=$DISPLAY
-    check_xvfb
-    chroot $HOST_IMG_DIR  $MV_ROOT/bin/MythVantage  -t  restore,default_1
-    chroot $HOST_IMG_DIR  $MV_ROOT/bin/restore_default_settings.sh -c restore -t syssettings
-    if [ !  $? = 0 ]
-    then
-            touch $mountpoint/tmp/.dbsysfailed
-            chmod 777 $mountpoint/tmp/.dbsysfailed
-    else
-        #Run second time
-        chroot "$HOST_IMG_DIR" $MV_ROOT/bin/systemconfig.sh misc,hostype,network,this_is_install
-        chroot "$HOST_IMG_DIR" $MV_ROOT/bin/restore_default_settings.sh -c  ACCESSCONTROL
-    fi
-chroot "$HOST_IMG_DIR" $MV_ROOT/bin/systemconfig.sh advanced,this_is_install
-cp -f $BASE/etc/X11/xorg.conf   $HOST_IMG_DIR/etc/X11/xorg.conf
-echo "Done" > $BASE/tmp/.install_state
-DISPLAY=$OLDDISPLAY
-
-#cp /tmp/mythvantage_install.log  $HOST_IMG_DIR/var/log/
-}
-
-function create_tftp_boot () {
-
-    CFGFILE=$TFTP/pxelinux.cfg/01-$2
-    echo "DEFAULT mythfe" > $CFGFILE
-    echo "LABEL mythfe" >> $CFGFILE
-    echo "kernel masterbuild/boot/vmlinuz26STB" >> $CFGFILE
-    echo "append vga=normal root=/dev/nfs rw netboot  nfsroot=$myip:/data/srv/tftp/$1 ip=dhcp init=/sbin/runit" >> $CFGFILE
-    echo "TIMEOUT 2" >>  $CFGFILE
-}
-
-function create_nfs_export () {
-echo "/data/srv/tftp/$1    *(rw,no_root_squash,anonuid=1000,anongid=1000) " >> /etc/exports
-exportfs -arv
-}
-
-#-------------------------------------------------------------------------------MAIN PROGRAM ---------------------------------------------------------------------
-if [ x$1 = x  -o   x$2 = x ]
-then
-    echo "usage:  hostname macaddress"
-	exit 1
-fi
-
-image_name=$1
-mac_address=`echo $2| tr "[:upper:]" "[:lower:]"`
-
-echo "using image_name of $image_name"
-echo "using mac_address of $mac_address"
-
-HOST_IMG_DIR=$TFTP/$1
-
-create_base_image $image_name
-configure_image
-umount $HOST_IMG_DIR/dev
-create_tftp_boot $image_name $mac_address
-create_nfs_export $image_name
-
-
-
-
-#create_dhcp_entry $mac_address
-
diff --git a/abs/core-testing/LinHES-config-22/checkout_MythVantage.sh b/abs/core-testing/LinHES-config-22/checkout_MythVantage.sh
deleted file mode 100755
index 944b9c6..0000000
--- a/abs/core-testing/LinHES-config-22/checkout_MythVantage.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-MYDIR=`pwd`
-MYTHPATH="\/data\/LinHES-PKGBUILD\/abs\/core-testing\/mythtv\/stable\/mythtv\/src\/mythtv-0.21"
-
-function setup_links {
-rm mythinstall.bin
-rm mythbeselect.bin
-ln -s  $MYDIR/src/MythVantage-app/mythinstall/mythinstall ./mythinstall.bin
-ln -s  $MYDIR/src/MythVantage-app/mythbeselect/mythbeselect ./mythbeselect.bin
-}
-
-function dl_repo {
-mkdir src
-cd src
-if [ ! -d MythVantage-app ]
-then
-    git clone http://mythvantage.com/MythVantage-app.git/
-    cd MythVantage-app
-    git checkout --track -b  LinHES origin/LinHES
-    cd $MYDIR
-    setup_links
-    cd -
-else
-    echo "updating exisiting tree"
-    cd MythVantage-app
-    git pull
-    git checkout master
-    git merge
-    cd -
-fi
-
-cd MythVantage-app
-git checkout master
-#git checkout origin/LinHES
-
-}
-
-dl_repo
-sed -i "s/^MYTHPATH.*$/MYTHPATH\=\"$MYTHPATH\"/g"  $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
-sed -i "s/#define __MVAPP__/\/\/#define __MVAPP__/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common.h
-sed -i "s/mythvantage/LinHES/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common.h
-
-echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythbeselect/mythberestart.pro
-echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
-cd $MYDIR/src/MythVantage-app/mythinstall && qmake
-make || exit 1
-cd $MYDIR/src/MythVantage-app/mythbeselect && qmake
-make ||exit 1
-
diff --git a/abs/core-testing/LinHES-config-22/create_master.sh b/abs/core-testing/LinHES-config-22/create_master.sh
deleted file mode 100755
index 1e641b4..0000000
--- a/abs/core-testing/LinHES-config-22/create_master.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-#CD=/mnt/cd
-CD=/data/srv/tftp/live
-DESTCD=/data/srv/tftp/CD
-DEST=/data/srv/tftp/masterbuild
-MODULES=$DESTCD/MythVantage/base/  
-myip=`ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'|head -n1`
-
-mkdir -p $DESTCD
-mkdir -p $DEST
-
-mount $CD
-status=0
-if [ -f $CD/MythVantage/base/data.lzm ]
-then
-	status=0
-else
-	status=1
-fi
-if [ x$status = x0 ]
-then
-	echo "copying to disk"
-	cp -rp $CD/*  $DESTCD
-	cd $MODULES
-	   for i in *.lzm 
-	   do
-		   echo $i
-		   lzm2dir $i \/$DEST
-	   done
-        for i in sys proc dev tmp
-        do
-        	mkdir $DEST/$i
-        done
-        chmod 777 /$DEST/tmp
-	mknod $DEST/dev/null c 1 3
-        mknod $DEST/dev/null c 1 5
-        mknod $DEST/dev/console c 5 1
-        chmod +s $DEST/usr/bin/Xorg
-        chmod +s $DEST/usr/bin/crontab
-        chmod +s $DEST/usr/bin/sudo
-        chmod +s $DEST/bin/mount
-fi
-if [ ! -f $DEST/etc/fstab.bak ]
-then
-	cp $DEST/etc/fstab $DEST/etc/fstab.bak
-fi
-tac $DEST/etc/fstab.bak|tail +4|tac  > $DEST/etc/fstab
-echo "$myip:/data/srv/tftp/masterbuild / nfs" >> $DEST/etc/fstab
-echo "/data/srv/tftp/masterbuild  *(rw,no_root_squash,anonuid=1000,anongid=1000)" >> /etc/exports
-
-
-exportfs -arv
-
-#copy in the modules
-mkdir -p $DEST/mnt/live/mnt/
-mv $DESTCD/*  $DEST/mnt/live/mnt/
-
diff --git a/abs/core-testing/LinHES-config-22/file_time_offset.py b/abs/core-testing/LinHES-config-22/file_time_offset.py
deleted file mode 100755
index f2973d0..0000000
--- a/abs/core-testing/LinHES-config-22/file_time_offset.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/python
-
-
-import time
-import os
-import glob
-import getopt
-import sys
-def main(argv):
-    filecount=0
-#    root = "/tmp"
-#    offset = 4
-    now = int(time.time())
-
-
-    try:
-        opts, args = getopt.getopt(argv, "hs:d:")
-    except getopt.GetoptError:
-        sys.exit(2)
-    for opt, arg in opts:
-        if opt in ("-h", "--help"):
-                print "-s seconds -d /testdir"
-                print "default if 4 seconds"
-                sys.exit()
-        elif opt in ( "-s" ):
-                offset = int(arg)
-        elif opt in ("-d"):
-                root = arg
-
-    for item in glob.glob(root+"/*"):
-        lastmodDate = os.path.getmtime(item)
-        tdiff= now-lastmodDate
-        #print tdiff, offset
-
-        if tdiff > offset:
-            filecount+=1
-    print filecount
-if __name__ == "__main__":
-    main(sys.argv[1:])
diff --git a/abs/core-testing/LinHES-config-22/install-ui.xml b/abs/core-testing/LinHES-config-22/install-ui.xml
deleted file mode 100755
index 2b3a043..0000000
--- a/abs/core-testing/LinHES-config-22/install-ui.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<!--
-
-    This is a myth style theme file for mythvantage
-
-    (c) 2005 by a whole bunch of people associated with MythTV
-
--->
-<mythuitheme>
-
-    <window name="welcome_screen">
-
-        <!--
-
-            First, define all the fonts we need on this screen
-
-        -->
-       <font name="title" face="Arial">
-           <color>#ffff00</color>
-           <dropcolor>#000000</dropcolor>
-           <size>20</size>
-           <shadow>3,3</shadow>
-           <bold>yes</bold>
-       </font>
-
-       <font name="time" face="Arial">
-            <color>#9999cc</color>
-            <size>18</size>
-            <bold>yes</bold>
-       </font>
-
-       <font name="label" face="Arial">
-            <color>#ffff00</color>
-            <dropcolor>#000000</dropcolor>
-            <size>18</size>
-            <shadow>3,3</shadow>
-            <bold>yes</bold>
-       </font>
-
-       <font name="info" face="Arial">
-            <color>#ffffff</color>
-            <size>18</size>
-            <bold>yes</bold>
-       </font>
-
-       <font name="biginfo" face="Arial">
-	       <color>#ffffff</color>
-	       <size>50</size>
-	       <bold>yes</bold>
-       </font>
-       <font name="warning" face="Arial">
-            <color>#ff0000</color>
-            <dropcolor>#000000</dropcolor>
-            <size>16</size>
-            <shadow>2,2</shadow>
-            <bold>yes</bold>
-       </font>
-
-       <font name="buttons" face="Arial">
-            <color>#ffff00</color>
-            <size>14</size>
-            <bold>yes</bold>
-       </font>
-       <font name="tinyinfo" face="Arial">
-           <color>#9999cc</color>
-           <size>12</size>
-           <bold>no</bold>
-       </font>
-
-       <container name="main_display">
-            <area>0,0,800,600</area>
-
-            <textarea name="title" draworder="0" align="center">
-                <multiline>no</multiline>
-                <font>title</font>
-                <area>50,40,700,40</area>
-                <value>LinHES: The Linux Home Entertainment System </value>
-            </textarea>
-
-            <!--
-                time
-            -->
-            <textarea name="time_text" draworder="0" align="right">
-                <multiline>no</multiline>
-                <font>time</font>
-                <area>660,520,110,30</area>
-                <value></value>
-            </textarea>
-
-            <textarea name="date_text" draworder="0" align="hcenter">
-                <multiline>yes</multiline>
-                <font>time</font>
-                <area>20,75,740,100</area>
-                <value></value>
-            </textarea>
-
-            <!--
-                current myth status
-            -->
-
-            <textarea name="status_text" draworder="1" align="center">
-                <multiline>yes</multiline>
-                <font>info</font>
-                <area>20,100,760,60</area>
-                <value>MythTV is idle and will shutdown shortly.</value>
-            </textarea>
-
-            <!--
-                current recordings status
-            -->
-
-            <textarea name="recording_label" draworder="1" align="center">
-                <font>label</font>
-                <area>20,140,760,30</area>
-                <!--<value>Percent Complete </value>-->
-                 <value></value>
-            </textarea>
-
-            <textarea name="recording_text" draworder="1" align="hcenter">
-                <multiline>yes</multiline>
-                <font>biginfo</font>
-                <area>20,140,760,150</area>
-                <value></value>
-            </textarea>
-
-            <!--
-                next scheduled recording status
-            -->
-
-            <textarea name="scheduled_label" draworder="1" align="center">
-                <font>label</font>
-                <area>20,320,760,30</area>
-                <value></value>
-            </textarea>
-
-            <textarea name="scheduled_text" draworder="1" align="hcenter">
-                <multiline>yes</multiline>
-                <font>biginfo</font>
-                <area>20,400,760,120</area>
-                <value></value>
-            </textarea>
-
-            <textarea name="mythvantage_text" draworder="1" align="right">
-                <multiline>no</multiline>
-                <font>tinyinfo</font>
-                <area>20,560,760,30</area>
-                <value></value>
-            </textarea>
-            <!--
-                scheduled recordings conflict warning
-            -->
-
-            <textarea name="conflicts_text" draworder="1" align="center">
-                <font>warning</font>
-                <area>20,490,760,30</area>
-                <value>WARNING: There are conflicting scheduled recordings!</value>
-            </textarea>
-
-            <!--
-                start frontend button
-
-            <textbutton name="startfrontend_button" draworder="1">
-                <position>81,535</position>
-                <font>buttons</font>
-                <image function="on" filename="mw_text_button_on.png"></image>
-                <image function="off" filename="mw_text_button_off.png"></image>
-                <image function="pushed" filename="mw_text_button_pushed.png"></image>
-            </textbutton>
-
-            -->
-
-	   </container>
-
-    </window>
-
-</mythuitheme>
diff --git a/abs/core-testing/LinHES-config-22/install_db_chroot.sh b/abs/core-testing/LinHES-config-22/install_db_chroot.sh
deleted file mode 100644
index 94305d2..0000000
--- a/abs/core-testing/LinHES-config-22/install_db_chroot.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-. /etc/profile
-. /etc/systemconfig
-
-
-myhost=$hostname
-hostname $myhost
-echo $myhost > /etc/hostname
-echo "install_db_chroot hostname is $hostname"
-
-. $MV_ROOT/bin/install_functions.sh
-#myhost=`cat /etc/hostname`
-
-#mount -t proc none /proc
-pacman --noconfirm -Sf mysql
-/etc/rc.d/mysqld
-
-status=1
-mysqlstatus=1
-while [ ! $status = 0  ]
-do
-    /etc/rc.d/mysqld stop
-    sleep 1
-    /etc/rc.d/mysqld start
-    mysqlstatus=$?
-    if [ $mysqlstatus = 0 ]
-    then
-   	mysql -e "show databases;"
-        showstatus=$?
-        if [ $showstatus = 0 ]
-        then
-            pacman --noconfirm -R mythdb-initial
-            pacman --noconfirm  -S mythdb-initial
-            $MV_ROOT/bin/restore_default_settings.sh -c load
-            DISPLAY=127.0.0.1:0  $MV_ROOT/bin/MythVantage  -t  restore,default_1
-            $MV_ROOT/bin/restore_default_settings.sh -c restore -t syssettings
-            $MV_ROOT/bin/systemconfig.sh misc,hostype,this_is_install
-
-            update_db_settings HostServiceMythWEB "1"
-            echo 'UseMythWEB="1"' >> /etc/systemconfig
-
-            #update database to allow user jobs on this host.
-            $MV_ROOT/bin/restore_default_settings.sh  -c  USERJOBALLOW
-            $MV_ROOT/bin/restore_default_settings.sh  -c  ACCESSCONTROL
-	   if [ -d /data/srv/mysql/mythconverg ]
-	   #if [ -d /var/lib/mysql/mythconverg ]
-	   then
-   	     # pacman --noconfirm -R webcalendar
-         #   pacman --noconfirm --nodeps  -S webcalendar
-	    status=0
-	   fi
-#        if [ $SystemType = "Master_backend" ]
-#        then
-#             $MV_ROOT/bin/restore_default_settings.sh  -c  BECONFIG  -s master  -a $dbhost
-#        fi
-   	fi
-    fi
-done
-/etc/rc.d/mysqld stop
-#umount /proc
-
-
-
diff --git a/abs/core-testing/LinHES-config-22/install_functions.sh b/abs/core-testing/LinHES-config-22/install_functions.sh
deleted file mode 100755
index 83a2bed..0000000
--- a/abs/core-testing/LinHES-config-22/install_functions.sh
+++ /dev/null
@@ -1,344 +0,0 @@
-#!/bin/bash
-. /etc/profile
-
-disk=$2
-mountpoint=new_boot
-
-#-------------------------------------------
-MYTHDBUSER=mythtv
-MYTHTVPASSWD=[REDACTED]
-CMDLINE=$(cat /proc/cmdline)
-hostname=`hostname`
-MYSQLCMD_C="mysql -u$MYTHDBUSER  -p$MYTHTVPASSWD mythconverg -B --exec"
-BASE=""
-found_remote=1
-
-function update_db_settings () {
-
- printhl "  setting database value $1 to $2 for $hostname"
- $MYSQLCMD_C "delete from settings where value='${1}' and hostname=\"$hostname\";"  2>/dev/null
- $MYSQLCMD_C "REPLACE INTO  settings set value='${1}', data='${2}' , hostname=\"$hostname\";" 2>/dev/null
-}
-
-function random_theme () {
-THEMES="basic-blue
-basic-green
-basic-red
-basic-purple
-basic-amber"
-
-theme=($THEMES)                # Read into array variable.
-
-num_themes=${#theme[*]}        # Count how many elements.
-
-pick=${theme[$((RANDOM%num_themes))]}
-printhl "   Selected $pick as the theme"
-update_db_settings Theme "$pick"
-}
-
-function parse_cmdline_2_db(){
-    echo $CMDLINE | grep -q displayres
-    if [ $? -eq 0 ]
-    then
-        TEMPVAR=${CMDLINE#*displayres=}
-        update_db_settings HostXres $TEMPVAR
-    fi
-
-}
-
-
-function bootsplash_setup (){
-    echo $CMDLINE | grep -q splash=silent
-    if [ $? -eq 0 ]
-    then
-        update_db_settings Hostbootsplash 1
-    else
-        update_db_settings Hostbootsplash 0
-    fi
-}
-
-
-function setupremote {
-    [ -e $BASE/etc/lircd.conf ] && mv -f $BASE/etc/lircd.conf $BASE/etc/lircd.conf.`date +%Y-%m-%d-%H-%M`
-    if [ -d $TEMPLATES/remotes/$Remotetype ]
-    then
-            cd $TEMPLATES/remotes/$Remotetype
-            for i in lircd*
-            do
-                    cat $i >> $BASE/etc/lircd.conf
-            done
-            cp -f lircrc* $BASE/etc/lircrc 2> /dev/null
-            [ -e /etc/lircrc ] && chmod 755 /etc/lircrc
-            update_db_settings HostRemoteType  "$Remotetype"
-        #special case for special remote
-        printhl "Starting with support for $Remotetype"
-        if [ "$Remotetype" == "dvico" ]
-        then
-            /usr/sbin/lircd  -d /dev/usb/hiddev0 --driver=dvico
-        elif [ "$Remotetype" == "Dvico-Dual-Digital4-rev2" ]
-        then
-            /usr/sbin/lircd -d /dev/input/irremote --driver=devinput
-        else
-            /usr/sbin/lircd -d /dev/lirc0
-        fi
-        [ -e /root/.mythtv ] ||  mkdir /root/.mythtv 2>/dev/null
-        ln -s /etc/lircrc /root/.mythtv/lircrc 2>/dev/null
-    else
-        echo "Couldn't open directory $TEMPLATES/remotes/$Remotetype"
-    fi
-}
-
-function scan_for_hpg_receiver() {
-printhl "   Scanning for Hauppauge receiver"
-for hpgid in `lspci -nm  -d4444: |cut -d" " -f6-  |tr -d '"'|tr " " :`
-do
-    line=`grep $hpgid $TEMPLATES/remotes/i2c.id`
-    if [ $? -eq 0 ]
-    then
-        modprobe lirc_i2c
-        FoundReceiverType=`echo "$line"|cut -d"|" -f2`
-        Remotetype=`echo "$line"|cut -d"|" -f4`
-        statusline=`echo "$line"|cut -d"|" -f2,4`
-        #echo "Found $statusline , $Remotetype"
-        echo "Found Hauppauge"
-        echo "-------------------"
-        echo "  1) Hauppauge black"
-        echo "  2) Hauppauge silver"
-        echo "  3) hauppauge-grey-g3"
-        echo ""
-        read -p "Which Hauppauge remote (5 sec): " -t 5 ans
-        echo
-        if [ "$?" != "0" ]; then
-        echo
-            echo "Using default $Remotetype"
-        else
-            case $ans in
-                1) Remotetype="hauppauge-black";;
-                2) Remotetype="hauppauge-silver";;
-                3) Remotetype="hauppauge-grey-g3" ;;
-                *) echo "Using default $Remotetype";;
-             esac
-        fi
-        update_db_settings  HostReceiverType $FoundReceiverType
-        found_remote=0
-        setupremote
-        break
-    fi
-done
-}
-
-
-function scan_for_usb_remote () {
-#found_remote=1
-printhl "   Scanning for usb receiver/remote"
-while read line
-do
-    USBID=`echo "$line"|cut -d"|"  -f1`
-    lsusb -d "$USBID" > /dev/null 2>/dev/null
-    if [ $? -eq 0 ]
-    then
-        Remotetype=`echo "$line"|cut -d"|" -f2`
-        printhl  "Found $Remotetype"
-        setupremote
-        found_remote=0
-        break
-    fi
-done <$BASE/$TEMPLATES/remotes/receiver_usb.id
-if [ $found_remote -eq 1 ]
-then
-    scan_for_hpg_receiver
-fi
-printhl "   Scanning for TatIR"
-if lsusb | grep 04d8:0004 > /dev/null 2>/dev/null
-then
-	/usr/bin/PyroUsb.py > /dev/null 2>&1 &
-fi
-
-if [ $found_remote -eq 1  ]
-then
-#No remote found_remote
-     update_db_settings HostRemoteType  "no_remote"
-fi
-
-}
-
-function rest_of_network () {
-    #netmask
-    echo $CMDLINE | grep -q cnetmask
-    if [ $? -eq 0 ]
-    then
-        TEMPVAR=${CMDLINE#*cnetmask=}
-        NETMASK=${TEMPVAR%% *}
-        /sbin/ifconfig eth0 $IP netmask $NETMASK
-        nm=`/usr/bin/nmconv.py -obits  $NETMASK`
-        NETMASK="/$nm $NETMASK"
-        #echo $NETMASK
-        update_db_settings HostNETMASK${MYTHDEFAULT} "$NETMASK"
-    else
-        printhl "   Netmask not found"
-    fi
-    #gateway
-    echo $CMDLINE | grep -q cgateway
-    if [ $? -eq 0 ]
-    then
-        TEMPVAR=${CMDLINE#*cgateway=}
-        GATEWAY=${TEMPVAR%% *}
-        /sbin/route add default  gw $GATEWAY
-        update_db_settings HostGW${MYTHDEFAULT} "$GATEWAY"
-    else
-        printhl  "  Gateway not found"
-    fi
-
-    #dns
-    echo $CMDLINE | grep -q cdns
-    if [ $? -eq 0 ]
-    then
-        TEMPVAR=${CMDLINE#*cdns=}
-        DNS=${TEMPVAR%% *}
-        echo "nameserver $DNS" >> /etc/resolv.conf
-        update_db_settings HostDNS${MYTHDEFAULT} "$DNS"
-        else
-            printhl "    DNS not found"
-    fi
-    echo $CMDLINE | grep -q chostname
-    if [ $? -eq 0 ]
-    then
-        TEMPVAR=${CMDLINE#*chostname=}
-        MYHOST=${TEMPVAR%% *}
-        update_db_settings HostMyhostname "$MYHOST"
-        else
-            printhl "    hostname not found"
-    fi
-}
-
-function init_network {
-    echo $CMDLINE |grep -q cnetdev
-    if [ $? -eq 0 ]
-    then
-        TEMPVAR=${CMDLINE#*cnetdev=}
-        MYTHDEFAULT=${TEMPVAR%% *}
-    else
-        MYTHDEFAULT="eth0"
-    fi
-
-    echo $CMDLINE | grep -q ip
-    if [ $? -eq 0 ]
-    then
-        update_db_settings HostDefaulteth0 0
-        update_db_settings HostDefault${MYTHDEFAULT} 1
-
-        update_db_settings HostActiveonbooteth0 0
-        update_db_settings HostActiveonboot${MYTHDEFAULT} 1
-        update_db_settings HostNetDevice ${MYTHDEFAULT}
-
-        TEMPVAR=${CMDLINE#*cip=}
-        IP=${TEMPVAR%% *}
-        if [ "$IP" == "dhcp" ]
-        then
-            /sbin/dhcpcd $MYTHDEFAULT
-            update_db_settings HostUseDHCP${MYTHDEFAULT} 0
-        else
-            /sbin/ifconfig ${MYTHDEFAULT} $IP
-            update_db_settings HostUseDHCP${MYTHDEFAULT} 1
-            update_db_settings HostIP${MYTHDEFAULT} "$IP"
-            rest_of_network
-        fi
-    fi
-
-
-
-
-}
-
-function dev_up_check(){
-    /sbin/ifconfig $1 1>/dev/null 2>/dev/null
-    status=$?
-    if [ $status -eq 1 ]
-    then
-        return 0
-    else
-        devip=`/sbin/ifconfig  | grep -C1 $1| grep inet|grep -v inet6  | cut -d: -f2 | awk '{ print $1}'`
-        if [  "x$devip" = "x" ]
-        then
-            return 1
-        else
-            return 0
-        fi
-    fi
-}
-
-function request_dhcp(){
-    echo $CMDLINE |grep -q cnetdev
-    if [ $? -eq 0 ]
-    then
-        TEMPVAR=${CMDLINE#*cnetdev=}
-        MYTHDEFAULT_NET=${TEMPVAR%% *}
-    else
-        MYTHDEFAULT_NET="eth0"
-    fi
-    for ndev in eth0 eth1 wlan0 wlan1 ath0
-    do
-        dev_up_check $ndev
-        status=$?
-        if [ $status -eq 1 ]
-        then
-            #interface is down, lets see if dhcp responds
-            dhcpcd -Td -t2 $ndev -h "" > /tmp/dhcpinfo.$ndev 2>/dev/null
-            #check for hostname here
-
-            TEMPVAR=`grep new_ip_address /tmp/dhcpinfo.$ndev |cut -d\= -f2`
-            if [ ! x$TEMPVAR = x ]
-            then
-                update_db_settings HostIP$ndev "$TEMPVAR"
-                TEMPVAR=`grep new_subnet_mask /tmp/dhcpinfo.$ndev |cut -d\= -f2`
-                nm=`/usr/bin/nmconv.py -obits  $TEMPVAR`
-                TEMPVAR="/$nm    $TEMPVAR"
-                update_db_settings HostNETMASK$ndev "$TEMPVAR"
-                TEMPVAR=`grep new_routers /tmp/dhcpinfo.$ndev |cut -d\= -f2`
-                update_db_settings HostGW$ndev "$TEMPVAR"
-                TEMPVAR=`grep new_domain_name_servers /tmp/dhcpinfo.$ndev |cut  -d\= -f2| tr -d \"|tr -d \'|cut -d" " -f 1`
-                update_db_settings HostDNS$ndev "$TEMPVAR"
-            fi
-        fi
-    done
-    TEMPVAR=`grep new_host_name /tmp/dhcpinfo.$MYTHDEFAULT_NET |cut -d\= -f2`
-    if [ ! x$TEMPVAR = x ]
-    then
-        update_db_settings HostMyhostname "$TEMPVAR"
-    fi
-
-}
-
-function init_remote {
-    echo $CMDLINE | grep -q remoteport
-    if [ $? -eq 0 ]
-    then
-        TEMPVAR=${CMDLINE#*remoteport=}
-        REMOTEPORT=${TEMPVAR%% *}
-    if [ x"$ReceiverType" = "xSerial" ]
-    then
-        if [ -e /dev/$REMOTEPORT ]
-        then
-            /usr/bin/setserial /dev/$REMOTEPORT uart none
-            /sbin/modprobe lirc_serial
-            update_db_settings HostReceiverType Serial
-            update_db_settings HostSerialPortlirc "$REMOTEPORT"
-        fi
-    fi
-
-    fi
-
-    echo $CMDLINE | grep -q remote
-    if [ $? -eq 0 ]
-    then
-        TEMPVAR=${CMDLINE#*remote=}
-        Remotetype=${TEMPVAR%% *}
-        setupremote
-    else
-        scan_for_usb_remote
-    fi
-}
-
-#-----------------------
-
-
diff --git a/abs/core-testing/LinHES-config-22/install_proxy.sh b/abs/core-testing/LinHES-config-22/install_proxy.sh
deleted file mode 100755
index 71b675b..0000000
--- a/abs/core-testing/LinHES-config-22/install_proxy.sh
+++ /dev/null
@@ -1,234 +0,0 @@
-#!/bin/bash
-export TERM=vt100
-MVHOSTNAME=larch5
-. /etc/profile
-TEMP_TEMPLATES=/tmp/templates
-disk=$2
-rootfs=$3
-rootsize=$4
-datafs=$5
-datasize=$6
-swapsize=$7
-mountpoint="/new_boot"
-run=$MV_ROOT/bin/install_functions.sh
-. /etc/systemconfig 2>/dev/null
-. $MV_ROOT/bin/networkconfig.sh
-CMDLINE=$(cat /proc/cmdline)
-BACKUPFILE="/myth/backup/mythconverg.sql.gz"
-
-
-progress () {
-    mypercent=`echo "$1" | cut -d. -f1`
-    if [  x$mypercent = x ]
-    then
-    echo "" > /tmp/.install_percent
-    else
-    echo "${mypercent}% complete" > /tmp/.install_percent
-    fi
-}
-
-
-case $1 in
-    full_install_it )
-             mv_install.py --rootdisk=$disk --rootfs=$rootfs --rootsize=$rootsize --datafs=$datafs --datasize=$datasize --datadisk=$disk --swapsize=$swapsize -c full_install
-             rc=$?
-             echo "mv_install.py exit code $rc"
-             if [ $rc != 0 ]
-             then
-                echo "mv_install error" >> /tmp/.install_error
-             fi
-             exit $rc
-            ;;
-
-    NETBOOT)
-            echo "-----------------------------------------------------------------------3-----"
-            netboot-full_install
-            ;;
-
-    find_update)
-            mv_install.py --rootdisk=$disk -c find_upgrade
-            ;;
-
-    upgrade_it)
-            mv_install.py --rootdisk=$disk --rootfs=$rootfs -c upgrade
-            ;;
-
-    disk_model_it)
-            model="unknown"
-            size="xxx"
-            case $2 in
-                h* )
-                        model=`cat /proc/ide/$2/model`
-                        ;;
-                s*)     model=`sginfo /dev/$2|grep Product|awk ' { print $2 } '`
-                        ;;
-            esac
-            size=`parted /dev/$2  print |grep Disk|awk  ' { print $3 } '  `
-            echo ""$model" $size " >/tmp/model
-            ;;
-
-    network_check_it)
-            #Should never return from check_network
-            case $2 in
-                    setup_network)
-                                vnc_check
-                                install_network_setup
-                    ;;
-
-                    check_self)
-                                myipdefault=`ifconfig  | grep -C1 $default_interface| grep -v $default_interface | cut -d: -f2 | awk '{ print $1}'`
-                                echo "network check myself"
-                                ifconfig
-                                ping -c 1 $myipdefault
-                                if [ ! $? = 0 ]
-                                then
-                                    exit 3
-                                    #can't ping yourself
-                                fi
-                    ;;
-                    check_gw)
-                                #check gateway
-                                echo "network check gateway"
-                                /sbin/route -n
-                                mygwdefault=`/sbin/route -n  |grep $default_interface|grep UG|awk '{ print $2}'`
-                                echo "Default gateway seems to be $mygwdefault"
-                                if  [ !  x$mygwdefault = x ]
-                                then
-                                    sleep 2
-                                    ping -c 5 $mygwdefault
-                                    if [ ! $? = 0 ]
-                                    then
-                                        exit 4
-                                    fi
-                                fi
-                    ;;
-                    check_ns)
-                                #check nameserver
-                                        echo " network check nameserver"
-                                        mydns=`cat /etc/resolv.conf|grep nameserver|head -1|awk '{ print $2}'`
-                                        ping -c 1 $mydns
-                                        if [ ! $? = 0 ]
-                                        then
-                                            exit 5
-                                        fi
-                    ;;
-                    check_names)
-                                echo "network check resolve names"
-                                host google.com
-                                if [ ! $? = 0 ]
-                                then
-                                    exit 6
-                                fi
-                    ;;
-                    host_names)
-                                #if host is found, then check to see if it's online
-                                #if hoip matchs my ip assume it's ok
-                                echo "network check my hostname $hostname"
-                                hout=`host $hostname|head -n1`
-                                status=$?
-                                hoip=`echo $hout|awk  '{print $4}'`
-                                if [ $hoip = found: ]
-                                then
-                                    status=1
-                                fi
-
-                                if [ $hoip = "out;" ]
-                                then
-                                    #;; connection timed out; no servers could be reached
-                                    echo "DNS servers not found"
-                                    status=1
-                                fi
-
-                                unkownhost=`host unkown.linhes.org |head -n1 `
-                                unkownhostip=`echo $unkownhost |awk  '{print $4}'`
-
-                                #found host, now grab the ip
-                                if [ $status = 0 ]
-                                then
-                                    hoip=`echo $hout|awk  '{print $4}'`
-                                    /sbin/ifconfig -a |grep -q $hoip
-                                    if [  $? = 0 ]
-                                    then
-                                        echo "DNS ip matches on of my ips $hoip"
-                                        status=0
-                                    else
-                                        if [ $unkownhostip = $hoip ]
-                                        then
-                                            echo "Bad DNS returning false hits"
-                                            echo "Assuming hostname is OK"
-                                            echo "DNS unknown: $unkownhostip"
-                                            echo "    HOSTDNS: $hoip       "
-                                            /sbin/ifconfig -a |grep "inet addr"
-                                        else
-                                            echo "IP in DNS but doesn't match mine, hostname is not safe to use"
-                                            echo "DNS:$hoip"
-                                            echo "HOST: "
-                                            /sbin/ifconfig -a |grep "inet addr"
-                                            status=7
-                                            fi
-                                    fi
-                                else
-                                    echo "Couldn't find hostname in DNS, must be safe to use"
-                                    status=0
-                                fi
-                                exit $status
-                    ;;
-
-                esac
-            exit 0
-        ;;
-
-    * )
-        if [ -f /tmp/.install_state ]
-        then
-                state=`cat /tmp/.install_state`
-        else
-        state=" "
-        fi
-            if  [  x"${state}" =  "xConfiguring system" ]
-            then
-                progress ""
-            else
-
-                if [ -f /tmp/.startsize.io ]
-                then
-                    . /tmp/.startsize.io
-                    #finding the drive
-                    ddrive=`df |  grep $mountpoint | head -n1 | awk -F/ ' { print $3 } ' | cut -d" " -f 1|cut -b1,2,3 `
-                    used=`statgrab -M disk.|grep ${ddrive}.write_bytes|cut -d= -f 2|tr -d " "`
-                    used=`echo $used-$STARTSIZE|bc`
-                        #echo $used
-                fi
-
-        if [ ! x$used = x ]
-            then
-                .  /root/.install_size
-                #somehow find if it's an install or update
-                if [ -f /tmp/.this_is_upgrade ]
-                then
-                    total=$UPGRADESIZE
-                else
-                    total=$TOTALSIZE
-                fi
-            percent=`echo "scale=2 ;  ($used/$total) * 100 " |bc `
-            cond2=$(echo "$percent > 98" |bc  )
-            if [ $cond2 -eq 1  ]
-            then
-                percent=98
-            fi
-            if  [  x"${state}" =  "xDone" ]
-            then
-                percent=100
-            fi
-            cond3=$(echo "$percent < 3" |bc )
-            if [ $cond3 -eq 0   ]
-                then
-                    progress $percent
-                fi
-            fi
-        fi
-    ;;
-esac
-
-
-
diff --git a/abs/core-testing/LinHES-config-22/issue b/abs/core-testing/LinHES-config-22/issue
deleted file mode 100644
index 00d4abd..0000000
--- a/abs/core-testing/LinHES-config-22/issue
+++ /dev/null
@@ -1,2 +0,0 @@
-LinHes
-
diff --git a/abs/core-testing/LinHES-config-22/live-install.sh b/abs/core-testing/LinHES-config-22/live-install.sh
deleted file mode 100755
index 573bb1f..0000000
--- a/abs/core-testing/LinHES-config-22/live-install.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-#redirect stderr to stdout, then rediret stdout to file
-. /etc/profile
-exec 2>&1
-exec > /tmp/mythvantage_install.log
-. /etc/X11/STBWINDOWMANAGER
-/usr/bin/nvidia-settings -a InitialPixmapPlacement=2
-keylaunch &
-/usr/bin/tilda &
-/usr/X11R6/bin/unclutter -root -idle 0 -jitter 400 -noevents  &
-export MALLOC_CHECK_=0
-if [ -f /opt/vmware/bin32/vmware-user-wrapper ]
-then
-	/opt/vmware/bin32/vmware-user-wrapper &
-fi
-xhost +
-CMDLINE=$(cat /proc/cmdline)
-echo $CMDLINE |grep -q nfsroot
-NFSROOT=$?
-if  [ x$NFSROOT = x1  ]
-then
-
-    unbuffer MythVantage &
-else
-    NETBOOT=YES     MythVantage &
-fi
-
-exec  $STBWINDOWMANAGER
diff --git a/abs/core-testing/LinHES-config-22/mv_advanced.py b/abs/core-testing/LinHES-config-22/mv_advanced.py
deleted file mode 100755
index 4790fcf..0000000
--- a/abs/core-testing/LinHES-config-22/mv_advanced.py
+++ /dev/null
@@ -1,384 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging, os, re
-import mv_common
-
-def setup_pacman(create_link):
-    if create_link:
-        logging.info("    Creating pacman link")
-        #LOOK
-        #This is not implmented yet, below is the bash code for reference
-        #if [ ! x$1 = x ]
-    #then
-        #ln -s ${BASE}/data/var ${BASE}/data/srv/httpd/htdocs/repo
-        #echo "creating the link for the pacman repo mirror"
-    #fi
-
-    #for i in mv-core mv-core-testing mv-extra mv-extra-testing
-    #do
-        #echo "[$i]"  > ${BASE}/etc/pacman.d/$i
-        ##add mirror if needed
-        #if [ x$PKG_MIRROR = x1 ]
-        #then
-            #echo " Server = http://$dbhost/repo/$i " >> ${BASE}/etc/pacman.d/$i
-        #fi
-        ##add user templates
-        #USERTEMPLATES="/data/home/mythtv/templates"
-        #if [ -f $USERTEMPLATES/sources/$i ]
-        #then
-            #echo "Adding user  $i"
-            #cat $USERTEMPLATES/sources/$i  >> ${BASE}/etc/pacman.d/$i
-        #fi
-        #cat $TEMPLATES/sources/$i  >> ${BASE}/etc/pacman.d/$i
-        #echo "setting local mirror to $dbhost for $i "
-    #done
-    else:
-        logging.info("    Pacman link will not be created")
-    return
-
-def setup_ncid_client(dbhost,templatefile):
-    #This always runs
-    logging.debug("    Configuring ncid client with server %s",dbhost)
-    cmd = '''sed -e "s/^set Host.*$/set Host %s /" %s >/etc/ncid/ncid.conf''' %(dbhost, templatefile)
-    return
-
-def setup_ncid_daemon(port,templatefile,Runncidd):
-    logging.info("    Configuring callerid daemon")
-    if Runncidd == "1":
-        logging.debug("    Port: %s",port)
-        mv_common.cp_and_log("/etc/ncid/ncidd.conf",templatefile)
-        cmd = '''sed -e "s/.*set ttyport.*$/set ttyport =  \/dev\/%s /" %s >/etc/ncid/ncidd.conf''' %(port,templatefile)
-        mv_common.runcmd(cmd)
-        mv_common.pacinstall("ncidd")
-        mv_common.add_service("ncidd")
-    else:
-        logging.debug("    Callerid will not run")
-        mv_common.pacremove("ncidd")
-        mv_common.remove_service("ncidd")
-    return
-
-def setup_splash(Usebootsplash):
-    if Usebootsplash == "1":
-        logging.info("    Enabling splash")
-        cmd = ''' sed -i "s/^default.*0/default 1/g" /boot/grub/menu.lst'''
-        mv_common.runcmd(cmd)
-    else:
-        logging.info("    Disabling splash")
-        cmd = ''' sed -i "s/^default.*1/default 0/g" /boot/grub/menu.lst'''
-        mv_common.runcmd(cmd)
-    return
-def setup_rrd(UseRRD):
-    if UseRRD == "1":
-        logging.info("    Enabling rrd_stats")
-        mv_common.pacinstall("rrd_stats")
-    else:
-        logging.info("    Disabling rrd_stats")
-        mv_common.pacremove("rrd_stats")
-
-
-def setup_hobbit(UseHobbit,SystemType,dbhost):
-    if UseHobbit == "1":
-        if SystemType == "Standalone" or SystemType == "Master_backend":
-            logging.info("    Installing hobbit server")
-            mv_common.pacinstall("hobbitserver")
-            mv_common.add_service("hobbit")
-        else:
-            logging.info("    Installing hobbit client")
-            mv_common.pacinstall("hobbit-client")
-            setup_hobbit_client(dbhost)
-            mv_common.add_service("hobbit-client")
-
-    else:
-            logging.info("    Removing Hobbit")
-            mv_common.pacremove("hobbit")
-            mv_common.pacremove("hobbit-client")
-            mv_common.remove_service("hobbit-client")
-            mv_common.remove_service("hobbitserver")
-            cmd = "rm -f /data/srv/httpd/htdocs/hobbit/index.html"
-            mv_common.runcmd(cmd)
-    return
-
-def setup_hobbit_client(dbhost):
-    logging.info("    Configuring hobbit client")
-    logging.debug("   hobbit server is %s:", dbhost)
-    cmd='''sed -i "s/^BBDISP.*$/BBDISP=%s/g" /data/srv/hobbit/client/etc/hobbitclient.cfg ''' %dbhost
-    mv_common.runcmd(cmd)
-    return
-
-def setup_evrouter(UseEvrouter,EvrouterConfig,template):
-    if UseEvrouter == "1":
-        logging.info("    Configuring everouter")
-        logging.debug("    EvrouterConfig is %s:",EvrouterConfig)
-        if EvrouterConfig == "tinker":
-            logging.debug("    tinker mode, not changing the config")
-            return
-        mv_common.pacinstall("evrouter")
-        mv_common.pacinstall("Xvfb")
-        mv_common.cp_and_log(template+"/evrouter/"+EvrouterConfig,"/etc/evrouter.cfg")
-        mv_common.add_service("evrouter")
-        mv_common.add_service("Xvfb")
-    else:
-        logging.info("    Not using evrouter")
-        mv_common.pacremove("evrouter")
-        mv_common.remove_service("evrouter")
-        mv_common.remove_service("Xvfb")
-
-    return
-
-def setup_DNSmasq(RunDHCP,ip,gw,nameserver):
-    if RunDHCP == "1":
-        logging.info("    Configuring dhcp server(dnsmasq)")
-        logging.debug("    ip: %s", ip)
-        logging.debug("    gw: %s", gw)
-        logging.debug("    ns: %s", nameserver)
-        mv_common.pacinstall("dnsmasq")
-        mv_common.pacinstall("mvpmc")
-        mv_common.add_service("dnsmasq")
-        logging.debug("    Setting default route to my gw: %s",gw)
-        try:
-            f = open("/etc/dnsmasq.conf",'r')
-            dnsconf = f.readlines()
-            f.close()
-        except:
-                logging.info("    Couldn't open dnsmasq.conf")
-                return
-        for line in dnsconf:
-            outline = line
-            if re.match("^dhcp-option=3",line):
-                logging.debug("    Setting default route to my gw: %s",gw)
-                outline = "dhcp-option=3,%s\n" %gw
-            if re.match("^dhcp-option=6",line):
-                logging.debug("    Setting dns to my ip: %s",ip)
-                outline = "dhcp-option=6,%s\n" %ip
-            f.write(outline)
-        f.close()
-
-        logging.debug("    change nfsroot to my ip:%s",ip)
-        cmd = '''sed -i "s/nfsroot=.*:/nfsroot=%s:/g" /data/srv/tftp/pxelinux.cfg/default''' %ip
-        mv_common.runcmd(cmd)
-
-        logging.debug("    Adding 127.0.0.1 to resolv.conf")
-        logging.debug("    other nameserver is %s",nameserver)
-        try:
-            f = open("/etc/resolv.conf",'r')
-            dns = f.readlines()
-            f.close()
-        except:
-                dns=''
-                logging.debug("   Couldn't open resolv.conf for reading")
-        try:
-            f = open("/etc/resolv.conf",'w')
-            line="search lan\n"
-            f.write(line)
-            line="nameserver 127.0.0.1\n"
-            f.write(line)
-            line="nameserver %s\n" %nameserver
-            f.write(line)
-            for line in dns:
-                f.write(line)
-            f.close()
-        except:
-                logging.debug("   Couldn't open resolv.conf for writing")
-
-        logging.debug("    setup dongle.config")
-        cmd = ''' sed -i "s/mvpmc -f .*/mvpmc -f \/etc\/helvR10.fon -s %s \& /" /data/srv/tftp/dongle.bin.config ''' %ip
-        #COMMAND="%s/mvpmc -f .*/mvpmc -f \/etc\/helvR10.fon -s ${ip} \& /"
-        #ex ${BASE}/data/srv/tftp/dongle.bin.config <<EOF
-        mv_common.runcmd(cmd)
-    else:
-        logging.info("    removing dhcp server(dnsmasq)")
-        mv_common.pacremove("dnsmasq")
-        mv_common.pacremove("mvpmc")
-        mv_common.remove_service("dnsmasq")
-    return
-
-def setup_mythweb(UseMythWEB):
-    if UseMythWEB == "1":
-        logging.info("    Activating mythweb")
-        mv_common.pacinstall("lighttpd")
-        mv_common.pacinstall("mythweb")
-        mv_common.add_service("lighttpd")
-    else:
-        logging.info("    Removing mythweb")
-#        mv_common.pacremove("lighttpd")
-        mv_common.pacremove("mythweb")
- #       mv_common.remove_service("lighttpd")
-    return
-
-def setup_samba(systemconfig,data_config):
-    mythhome = data_config.MYTHHOME
-    if systemconfig["UseSamba"] == "1":
-        logging.info("    Activating windows file sharing")
-        usersamba=mythhome+"/templates/smb.conf"
-        mv_common.pacinstall("samba")
-        if not os.path.exists("/etc/samba"):
-            logging.debug("    Creating directory /etc/samba")
-            try:
-                os.makedirs("/etc/samba")
-            except:
-                pass
-
-        if os.path.exists(usersamba):
-            logging.debug("    Using user provided config file %s",usersamba)
-            cmd = "install -D -m755  %s /etc/samba/smb.conf" %usersamba
-            mv_common.runcmd(cmd)
-        else:
-            Samba_media = systemconfig["Samba_media"]
-            Samba_home = systemconfig["Samba_home"]
-            if systemconfig["Samba_mediareadonly"] == "1":
-                smreadonly = "yes"
-            else:
-                smreadonly = "no"
-
-            if systemconfig["Samba_homereadonly"] == "1":
-                shreadonly = "yes"
-            else:
-                shreadonly = "no"
-            domain = systemconfig["Samba_domain"]
-            servername = systemconfig["hostname"]
-
-            try:
-                f = open(systemconfig["TEMPLATES"]+"/samba/smb.conf.template",'r')
-                t_smbconf = f.readlines()
-                f.close()
-            except:
-                logging.info("   Couldn't open samba template file")
-                return
-
-            try:
-                f = open("/etc/samba/smb.conf",'w')
-            except:
-                logging.info("   Couldn't open samba file")
-                return
-
-            for line in t_smbconf:
-                outline = line
-                if re.match("^.*workgroup", line):
-                    logging.debug("    Setting workgroup to %s",domain)
-                    outline="workgroup = %s\n" %domain
-                    logging.debug("     %s",outline)
-                if re.match("^.* server string",line):
-                    logging.debug("    Setting server name to %s",servername)
-                    outline="server string = %s\n" %servername
-                    logging.debug("     %s",outline)
-                f.write(outline)
-            outline="include =  %s/templates/user.shares \n" %mythhome
-            f.write(outline)
-            if Samba_media == "1":
-                outline="include =  /etc/samba/smb.conf.media\n"
-                f.write(outline)
-            if Samba_home == "1":
-                outline="include =  /etc/samba/smb.conf.home\n"
-                f.write(outline)
-            f.close()
-            logging.info("    Writing smb.conf.media")
-            try:
-                f = open("/etc/samba/smb.conf.media","w")
-            except:
-                logging.info("    Couldn't open smb.conf.media")
-                return
-            medialines='''
-[%s]
-path = %s
-public = yes
-only guest = yes
-writeable  = %s
-printable = no
-force user = mythtv
-force group = mythtv
-create mask = 0755''' %(data_config.SMEDIA,data_config.DATAMOUNT,smreadonly)
-            f.write(medialines)
-            f.close
-            logging.debug("     %s",medialines)
-            logging.info("    Writing smb.conf.home")
-            try:
-                    f = open("/etc/samba/smb.conf.home","w")
-            except:
-                logging.info("    Couldn't open smb.conf.home")
-                return
-            homelines='''
-[home]
-path = %s
-public = yes
-only guest = yes
-writeable  = %s
-printable = no
-force user = mythtv
-force group = mythtv
-create mask = 0755 ''' %(data_config.MYTHHOME,shreadonly)
-            f.write(homelines)
-            f.close
-            logging.debug("     %s",homelines)
-
-
-        mv_common.add_service("nmbd")
-        mv_common.add_service("smbd")
-    else:
-        logging.info("  Removing windows file sharing")
-        mv_common.remove_service("smbd")
-        mv_common.remove_service("nmbd")
-        mv_common.pacremove("samba")
-        mv_common.pacinstall("smbclient")
-    return
-
-def setup_NFSshares(UseNFS,templatefile):
-    if UseNFS == "1":
-        logging.info("    Activating NFS server")
-        mv_common.pacinstall("nfs-utils")
-        mv_common.pacinstall("portmap")
-        cmd = '''sed -e "s/REPLACEME/*/g" %s  >/etc/exports''' %templatefile
-        mv_common.add_service("nfsd")
-        mv_common.add_service("nfs-utils")
-        mv_common.add_service("portmap")
-    else:
-        logging.info("    Removing NFS server")
-        mv_common.remove_service("nfsd")
-    return
-
-def setup_dyndns(DDnsEnable):
-    if DDnsEnable == "1":
-        logging.info("    Installing Dynamic DNS client")
-        mv_common.pacinstall("inadyn")
-        mv_common.add_service("inadyn")
-    else:
-        logging.info("    Removing Dynamic DNS client")
-        mv_common.pacremove("inadyn")
-        mv_common.remove_service("inadyn")
-
-
-def setup_advanced(systemconfig,data_config):
-    logging.info("____Start of advanced configuration____")
-    create_link = False
-    if systemconfig["SystemType"] == "Master_backend":
-        create_link = True
-    setup_pacman(create_link)
-    setup_ncid_client(systemconfig["dbhost"],
-                      systemconfig["TEMPLATES"]+"/ncid.conf.template")
-
-    setup_ncid_daemon(systemconfig["nciddSerialPort"],
-                      systemconfig["TEMPLATES"]+"/ncidd.conf.template",
-                      systemconfig["Runncidd"])
-
-    setup_splash(systemconfig["Usebootsplash"])
-    if data_config.SYSTEMTYPE == "MythVantage":
-        setup_hobbit(systemconfig["UseHobbit"],
-                    systemconfig["SystemType"],
-                    systemconfig["dbhost"])
-    if data_config.SYSTEMTYPE == "LinHES":
-        setup_rrd(systemconfig["UseRRD"])
-
-    setup_evrouter(systemconfig["UseEvrouter"],
-                   systemconfig["EvrouterConfig"],
-                   systemconfig["TEMPLATES"])
-
-    setup_DNSmasq(systemconfig["RunDHCP"],
-                  systemconfig["mythip"],
-                  systemconfig["mythgw"],
-                  systemconfig["mythdns"])
-
-    setup_mythweb(systemconfig["UseMythWEB"])
-    setup_samba(systemconfig,data_config)
-    setup_NFSshares(systemconfig["UseNFS"],
-                systemconfig["TEMPLATES"]+"/exports.template")
-
-    setup_dyndns(systemconfig["DDnsEnable"])
-    logging.info("__End of advanced configuration\n")
diff --git a/abs/core-testing/LinHES-config-22/mv_common.py b/abs/core-testing/LinHES-config-22/mv_common.py
deleted file mode 100755
index a492597..0000000
--- a/abs/core-testing/LinHES-config-22/mv_common.py
+++ /dev/null
@@ -1,201 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging, os, time
-import commands
-config_file = "mv_config"
-data_config = __import__(config_file, globals(), locals(), [])
-
-def runcmd(cmd):
-    if data_config.NOOPDEBUG=="FALSE":
-        pass
-    else:
-        cmd = "echo "+cmd
-    logging.debug("    %s",cmd)
-    cmdout = commands.getstatusoutput(cmd)
-    logging.debug("    %s",cmdout)
-    return cmdout[0]
-
-def runcmd_output(cmd):
-    if data_config.NOOPDEBUG=="FALSE":
-        pass
-    else:
-        cmd = "echo "+cmd
-    logging.debug("    %s",cmd)
-    cmdout = commands.getstatusoutput(cmd)
-    logging.debug("    %s",cmdout)
-    return cmdout[1]
-
-def services(systemconfig):
-    logging.debug("______Start of services______")
-    logging.debug("__End services")
-
-def cp_and_log(srcfile,destfile):
-    #return
-    if not os.path.exists(srcfile):
-        logging.info("%s is not present, skipping...",srcfile)
-    else:
-        cmd = ("rsync -arhp %s %s") %(srcfile,destfile)
-        runcmd(cmd)
-
-
-def add_service(daemon):
-    logging.info("    Adding service %s",daemon)
-    cmd = "add_service.sh %s" %daemon
-    runcmd(cmd)
-
-def remove_service(daemon):
-    logging.info("    Removing service %s",daemon)
-    stop_service(daemon)
-    cmd = "remove_service.sh %s" %daemon
-    runcmd(cmd)
-
-def start_service(daemon):
-    logging.info("    start service %s",daemon)
-    cmd = "sv start %s" %daemon
-    runcmd(cmd)
-
-def stop_service(daemon):
-    logging.info("    stop service %s",daemon)
-    cmd = "sv stop %s" %daemon
-    runcmd(cmd)
-
-def restart_service(daemon):
-    logging.info("    Restarting service %s",daemon)
-    if daemon == "lcdd":
-        stop_service(daemon)
-        logging.debug("    killing all lcdd")
-        cmd = "killall -9 LCDd"
-        runcmd(cmd)
-        time.sleep(2)
-        start_service(daemon)
-    else:
-        cmd = "sv restart %s" %daemon
-        runcmd(cmd)
-
-def hup_service(daemon):
-    logging.info("    hup service %s",daemon)
-    cmd = "sv hup %s" %daemon
-    runcmd(cmd)
-
-
-
-def pkg_blacklist_check(pkg):
-    cmd = '''grep -q %s /etc/blacklist.package''' %pkg
-    rc = runcmd(cmd)
-    if rc == 0:
-        return True
-    else:
-        return False
-
-def pkg_installed_check(pkg):
-    logging.debug("    Checking if %sis installed",pkg)
-    cmd = "pacman -Q %s " %pkg
-    rc = runcmd(cmd)
-    if rc == 0:
-        return True
-    else:
-        return False
-
-
-def pacinstall(pkg):
-    logging.info("    Checking %s for install",pkg)
-    #extra pkg check
-    if pkg == "xine":
-        pacinstall("xine-ui")
-    elif pkg == "dvdcss":
-        pacinstall("libdvdcss")
-    elif pkg == "webmin":
-        add_service("webmin")
-    elif pkg == "fuppes":
-        pacinstall("fuppes-svn")
-
-    if  not pkg_blacklist_check(pkg):
-        if pkg_installed_check(pkg):
-            logging.info("    %s is already installed, will not install",pkg)
-        else:
-            logging.info("    Installing %s",pkg)
-            cmd ='''pacman --noconfirm -Sf %s ''' %pkg
-            runcmd(cmd)
-    else:
-        logging.info("    %s is blacklisted, will not install",pkg)
-
-def pacremove(pkg):
-    logging.info("    Checking %s for removal",pkg)
-    if pkg == "xine":
-        pacremove("xine-ui")
-    elif pkg == "dvdcss":
-        pacremove("libdvdcss")
-    elif pkg == "webmin":
-        remove_service("webmin")
-
-    if  not pkg_blacklist_check(pkg):
-        if not pkg_installed_check(pkg):
-            logging.info("    %s is not installed, will not remove",pkg)
-        else:
-            logging.info("    Removing %s",pkg)
-            cmd ='''pacman --noconfirm -R  %s ''' %pkg
-            runcmd(cmd)
-    else:
-        logging.info("    %s is blacklisted, will not remove",pkg)
-
-def getpid(process):
-    return commands.getoutput('pidof %s' % process)
-
-def remove_file(filename):
-    logging.debug("    Removing %s", filename)
-    try:
-        os.remove(filename)
-    except:
-        logging.debug("*     Could not remove %s", filename)
-
-
-def restartLCD(RESTART_LCD):
-    if  RESTART_LCD :
-        logging.info("    Restarting lcd server")
-        cmd = "killall -9 mythlcdserver"
-        runcmd(cmd)
-    else:
-        logging.debug("    Not restarting MYTHLCD server")
-
-
-def reloadfe(dbhost,RESTART_LCD):
-    logging.debug("____Start of reloadfe____")
-    if data_config.SYSTEMTYPE == "MythVantage":
-        logging.info("    Clearing Backend cache")
-        cmd = '''/usr/bin/backend_control.sh  clearcache  behost %s''' %dbhost
-        runcmd(cmd)
-
-    restartLCD(RESTART_LCD)
-    for pid in getpid("mythfrontend"):
-        cmd = ''' kill -s USR1 %s ''' %pid
-        #runcmd(cmd)
-        logging.info("    Reloading frontend with pid of %s",pid)
-
-    logging.debug("__End of reloadfe\n")
-
-
-def restartfe(RESTART_LCD):
-    logging.debug("____Start of restartfe____")
-    if data_config.SYSTEMTYPE=="LinHES":
-        logging.debug("    LinHES seems to be running will not restartfe")
-        return
-    logging.info("    Restarting frontend")
-    restartLCD(RESTART_LCD)
-    cmd="killall -9 mythfrontend"
-    runcmd(cmd)
-    cmd="killall -9 welcome"
-    runcmd(cmd)
-    logging.debug("__End of restartfe\n")
-
-
-def udev_trigger():
-    logging.info("    Triggering udev")
-    cmd = "udevadm settle"
-    runcmd(cmd)
-    cmd = "udevadm trigger"
-    runcmd(cmd)
-    cmd = "udevadm settle"
-    runcmd(cmd)
-    cmd = "udevadm trigger"
-    runcmd(cmd)
-
-
diff --git a/abs/core-testing/LinHES-config-22/mv_config.py b/abs/core-testing/LinHES-config-22/mv_config.py
deleted file mode 100755
index 1ac4fea..0000000
--- a/abs/core-testing/LinHES-config-22/mv_config.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- coding: utf-8 -*-
-SYSTEMTYPE="LinHES"
-MVHOSTNAME="larch5"
-MOUNTPOINT="/new_boot"
-DATAMOUNT="/myth"
-MYTHHOME="/home/mythtv"
-SQUASHFILE="/tmp/.squashlist"
-SQUASHLIST=("bin","boot","etc","home","lib","opt","root","sbin","usr","var","data")
-NOOPDEBUG="FALSE"
-BACKUPFILE="mythconverg.sql.gz"
-BACKUPPATH="/myth/backup/"
-TEMP_TEMPLATES="/tmp/templates"
-SMEDIA="myth"
-
-
-
-
diff --git a/abs/core-testing/LinHES-config-22/mv_ddns.py b/abs/core-testing/LinHES-config-22/mv_ddns.py
deleted file mode 100755
index 7ac7d3a..0000000
--- a/abs/core-testing/LinHES-config-22/mv_ddns.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging, mv_common
-import os, re
-
-config_file = "mv_config"
-
-def setup_ddns(systemconfig):
-    logging.info("____Start of setup_ddns____")
-
-    if systemconfig["DDnsEnable"] == "1":
-        logging.debug("    Enabling DDNS")
-	mv_common.pacinstall("ddclient")
-	mv_common.cp_and_log("/etc/ddclient/ddclient.conf.dynamic.dyndns.sample", 
-	  		     "/etc/ddclient/ddclient.conf")
-	cmd = ''' sed -i -e "s/your-dynamic-dyndns-login/%s/g" /etc/ddclient/ddclient.conf''' %(systemconfig["DDnslogin"])
-	mv_common.runcmd(cmd)
-	cmd = ''' sed -i -e "s/your-dynamic-dyndns-password/%s/g" /etc/ddclient/ddclient.conf''' %(systemconfig["DDnspassword"])
-	mv_common.runcmd(cmd)
-	cmd = ''' sed -i -e "s/your-dynamic-dyndns-host/%s/g" /etc/ddclient/ddclient.conf''' %(systemconfig["DDnshostname"])
-	mv_common.runcmd(cmd)
-	mv_common.add_service("ddclient")
-    else:
-        logging.debug("    Disabling DDNS")
-	mv_common.remove_service("ddclient")
-
-    logging.info("__End of ddns\n")
diff --git a/abs/core-testing/LinHES-config-22/mv_hostype.py b/abs/core-testing/LinHES-config-22/mv_hostype.py
deleted file mode 100755
index d6ec0ed..0000000
--- a/abs/core-testing/LinHES-config-22/mv_hostype.py
+++ /dev/null
@@ -1,230 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging, mv_common
-import os
-
-config_file = "mv_config"
-data_config = __import__(config_file, globals(), locals(), [])
-
-def setup_ntp(usepool,ntpserver):
-    if usepool:
-        logging.info("Setting ntp server to %s",ntpserver)
-        print '''sed -i "s/pool.ntp.org/$dbhost/g" ${BASE}/etc/ntp.conf'''
-    else:
-        logging.info("Not changing ntp configuration")
-
-def setup_avahi(templates):
-    file="/etc/avahi/services/mysql.service"
-    if not os.path.exists(file):
-        logging.debug("    copying in mysql.service for avahi")
-        try:
-            os.makedirs("/etc/avahi/services")
-        except:
-            logging.debug("    Couldn't create /etc/avahi/services")
-        mv_common.cp_and_log(templates+"/mysql.service",file)
-        cmd="sudo sv restart avahi"
-        mv_common.runcmd(cmd)
-
-def remove_avahi_service():
-    file="/etc/avahi/services/mysql.service"
-    if os.path.exists(file):
-        logging.debug("    Removing avahi mysql.service file")
-        cmd="rm -rf %s" %file
-        mv_common.runcmd(cmd)
-        cmd="sudo sv restart avahi"
-        mv_common.runcmd(cmd)
-
-def setup_db():
-    logging.debug("    Setting up the database")
-
-def setup_mysqlnetwork(EnableNetwork):
-    logging.debug("    Setting up mysql network")
-    mysqlconf = "/etc/my.cnf"
-    cmd = '''grep "#skip-networking" %s ''' %mysqlconf
-    status = mv_common.runcmd(cmd)
-
-    if EnableNetwork :
-        logging.debug("    Enabling mysql networking")
-        if status == 0 :
-            logging.debug("    Network is already enabled for mysql")
-        else:
-            cmd = '''sed -ie "s/^skip-networking/#skip-networking/g" %s ''' %mysqlconf
-            mv_common.runcmd(cmd)
-            mv_common.restart_service("mysqld")
-    else:
-        logging.debug("    Disabling mysql networking")
-        if status == 1 :
-            logging.debug("    Network is already disabled for mysql")
-        else:
-            cmd = '''sed -ie "s/#skip-networking/skip-networking/g" %s ''' %mysqlconf
-            mv_common.runcmd(cmd)
-            mv_common.restart_service("mysqld")
-
-def setup_mysql_connection(systemconfig):
-    logging.info("    Configuring database connection")
-    mythip = systemconfig["mythip"]
-    systemtype = systemconfig["SystemType"]
-    mv_root = systemconfig["MVROOT"]
-    mysqltxt = "/usr/share/mythtv/mysql.txt"
-    templates = systemconfig["TEMPLATES"]
-    mysqltemplate = templates + "/mysql.txt"
-    dbhost = systemconfig["dbhost"]
-
-    if systemtype == "Master_backend":
-        logging.debug("    Setting dbhost to %s in systemconfig", mythip)
-        dbhost = mythip
-        cmd = '''sed -ei "s/^dbhost=.*$/dbhost=\"%s\"/" /etc/systemconfig ''' %dbhost
-        mv_common.runcmd(cmd)
-        logging.debug("    Changing dbhost in settings table for master_backend")
-        cmd = '''%s/bin/restore_default_settings.sh -c BECONFIG -s master -a %s ''' %(mv_root, dbhost)
-        mv_common.runcmd(cmd)
-
-    if systemtype == "Slave_backend":
-        slavehost = mythip
-        logging.debug("    Changing slave in settings: %s", slavehost)
-        cmd = '''%s/bin/restore_default_settings.sh -c BECONFIG -s slave  -a %s ''' %(mv_root, slavehost)
-        mv_common.runcmd(cmd)
-
-    if systemtype == "Master_backend":
-        logging.debug("   changing mysql.txt file to use localhost")
-        cmd = '''sed -e "s/^DBHostName=.*$/DBHostName="localhost"/" %s > %s ''' %(mysqltemplate, mysqltxt)
-        mv_common.runcmd(cmd)
-    else:
-        logging.debug("   changing mysql.txt file to use %s", dbhost)
-        cmd = '''sed -e "s/^DBHostName=.*$/DBHostName=%s/" %s > %s ''' %(dbhost, mysqltemplate, mysqltxt)
-        mv_common.runcmd(cmd)
-
-    delfile = data_config.MYTHHOME + "/.mythtv/mysql.txt"
-    mv_common.remove_file(delfile)
-    delfile = mv_root + "/bin/mythtv/.mythtv/mysql.txt"
-    mv_common.remove_file(delfile)
-    filecheck = data_config.MYTHHOME + "/templates/mysql.txt"
-    if os.path.exists(filecheck):
-        logging.info("    Scrapping all the previous work and using %s for mysql.txt", filecheck)
-        mv_common.cp_and_log(filecheck, mysqltxt)
-
-
-
-def setup_func_key():
-    if data_config.SYSTEMTYPE == "MythVantage":
-        logging.debug("    Grabbing the key for Func")
-        cmd="/usr/MythVantage/bin/grabkey.py"
-        mv_common.runcmd(cmd)
-
-def setup_func_minion(dbhost):
-    logging.info("    Setting up the func minion:")
-    logging.debug("   certmaster is %s:",dbhost)
-    #cmd='''sed -i "s/^certmaster.*$/certmaster = %s/" /etc/func/minion.conf ''' %dbhost
-    #mv_common.runcmd(cmd)
-    cmd='''sed -i "s/^certmaster.*$/certmaster = %s/" /etc/certmaster/minion.conf ''' %dbhost
-    mv_common.runcmd(cmd)
-
-def setup_syslog(dbhost):
-    logging.debug("    Setting syslog to log to %s",dbhost)
-    cmd ='''sed -i "s/^destination d_remote.*$/destination d_remote \{tcp\(\"%s\" port\(514\)\) \;\} \;/" /etc/syslog-ng.conf''' %dbhost
-    return
-
-def hostypeprint(systemconfig):
-    logging.info("______Start of hostype config_____")
-    mv_common.services(systemconfig)
-    install_list=''
-    remove_list=''
-    daemon_list=''
-    daemon_remove_list=''
-    run_mysqlnetwork = False
-
-    if systemconfig["SystemType"] == "Standalone":
-        logging.info("Stand alone system being configured")
-        setup_ntp(False,"null")
-        remove_avahi_service()
-        EnableNetwork = False
-        run_mysqlnetwork = True
-        if systemconfig["hostypec"]:
-            setup_db()
-        install_list=["mysql", "mythdb-initial", "avahi", "portmap", "nfs-utils", "local-website", "myth2ipod", "mythtv-status"]
-        daemon_list=["mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd"]
-        if data_config.SYSTEMTYPE == "MythVantage":
-          install_list.append('ghosd')
-
-    elif systemconfig["SystemType"] == "Master_backend":
-        logging.info("Master backend system being configured")
-        setup_ntp(False,"null")
-        setup_avahi(systemconfig["TEMPLATES"])
-        install_list=["mysql", "mythdb-initial", "avahi", "portmap", "nfs-utils", "local-website", "myth2ipod", "mythtv-status"]
-        daemon_list=["mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd"]
-        EnableNetwork = True
-        run_mysqlnetwork = True
-        if data_config.SYSTEMTYPE == "MythVantage":
-            install_list.append('func')
-            daemon_list.append('func')
-            install_list.append('certmaster')
-            daemon_list.append('certmaster')
-            install_list.append('ghosd')
-
-    elif systemconfig["SystemType"] == "Slave_backend":
-        logging.info("Slave backend  system being configured")
-        setup_ntp(True,systemconfig["dbhost"])
-        remove_avahi_service()
-        if systemconfig["hostypec"]:
-            setup_db()
-        install_list = ["portmap", "nfs-utils", "local-website", "avahi", "libmysqlclient" ]
-        daemon_list = ["mythbackend", "portmap", "nfs-utils", "netfs", "lighttpd", "avahi" ]
-        daemon_remove_list=('mysql')
-        if data_config.SYSTEMTYPE == "MythVantage":
-            install_list.remove("local-website")
-            daemon_list.remove("lighttpd")
-            install_list.append('func')
-            daemon_list.append('funcd')
-            remove_list.append("lighttpd")
-            install_list.append('ghosd')
-
-
-    elif systemconfig["SystemType"] == "Frontend_only":
-        logging.info("Frontend only system being configured")
-        setup_ntp(True,systemconfig["dbhost"])
-        remove_avahi_service()
-        install_list=["mysql-clients", "libmysqlclient",  "avahi", "portmap", "nfs-utils", "local-website"]
-        remove_list=["mysql"]
-        daemon_list=["mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd"]
-        daemon_remove_list=("mysql", "mythbackend")
-        if data_config.SYSTEMTYPE == "MythVantage":
-            install_list.remove("local-website")
-            daemon_list.remove("lighttpd")
-            install_list.append('func')
-            daemon_list.append('funcd')
-            remove_list.append("lighttpd")
-            install_list.append('ghosd')
-
-
-    for pkg in install_list:
-        mv_common.pacinstall(pkg)
-    for pkg in remove_list:
-        mv_common.pacinstall(pkg)
-    for daemon in daemon_list:
-        mv_common.add_service(daemon)
-    for daemon in daemon_remove_list:
-        mv_common.remove_service(daemon)
-    if systemconfig["RunFrontend"] == "1":
-        logging.debug("   Will run the frontend")
-        mv_common.add_service("frontend")
-        mv_common.add_service("hal")
-        if data_config.SYSTEMTYPE == "MythVantage":
-            mv_common.add_service("ghosd")
-    else:
-        logging.debug("   Will NOT run the frontend")
-        mv_common.remove_service("frontend")
-        mv_common.remove_service("hal")
-        if data_config.SYSTEMTYPE == "MythVantage":
-            mv_common.remove_service("ghosd")
-
-
-    if run_mysqlnetwork:
-        setup_mysqlnetwork(EnableNetwork)
-    else:
-        logging.debug("    Not running setup_mysql_connection")
-
-    setup_mysql_connection(systemconfig)
-    if data_config.SYSTEMTYPE == "MythVantage":
-        setup_func_minion(systemconfig["dbhost"])
-        setup_func_key()
-        setup_syslog(systemconfig["dbhost"])
-    logging.info("__End of hostype config\n")
diff --git a/abs/core-testing/LinHES-config-22/mv_install.py b/abs/core-testing/LinHES-config-22/mv_install.py
deleted file mode 100755
index 19295ca..0000000
--- a/abs/core-testing/LinHES-config-22/mv_install.py
+++ /dev/null
@@ -1,1432 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-import sys,  os,  commands,  glob,  time
-import getopt,  re,  MySQLdb
-import logging
-try:
-    import parted
-except:
-    print "module parted not found"
-
-def usage():
-    print "help text:"
-    print "example usage:  --rootdisk=sda --rootfs=ext4 --rootsize=34240 --datafs=ext4 --datasize=3400 --datadisk=sda --swapsize=340 -c full_install"
-
-def clean_upgrade():
-    return False
-
-def error_out(errmsg):
-    cmd = '''echo %s >> /tmp/.install_error ''' %errmsg
-    runcmd(cmd)
-    logging.critical("***********************************")
-    logging.critical("error: %s",errmsg)
-    print "***********************************"
-    print "ERROR: mv_install.py: %s" %errmsg
-    print "***********************************"
-    sys.exit(1)
-
-
-def update_db(value, data):
-    db = MySQLdb.connect(host="localhost",  user="mythtv",  passwd="[REDACTED]  db="mythconverg")
-    try:
-        cursor = db.cursor()
-        cursor.execute("DELETE FROM settings where value=%s and hostname=%s;", (value, data_config.MVHOSTNAME))
-        cursor.execute("REPLACE INTO  settings set value=%s, data=%s, hostname=%s;", (value, data, data_config.MVHOSTNAME))
-        logging.debug("Updated database  with %s, %s", data, value)
-    except  MySQLdb.Error,  e:
-        logging.debug("Unable to update database with %s, %s", data, value)
-
-
-def progress(pgnum):
-    progressline = str(pgnum) + "% complete"
-    logging.debug("Progress: %s",  pgnum)
-    f = open('/tmp/.install_percent',  'w')
-    f.write(progressline)
-    f.close()
-
-def update_status(status):
-    logging.debug("Status: %s",  status)
-    f = open('/tmp/.install_state',  'w')
-    f.write(str(status))
-    f.close()
-
-def kill_dhcp_chroot():
-    logging.debug("Killing off chroot dhcpcd")
-    stddir = os.getcwd()
-    piddir = ("%s/var/run/") %data_config.MOUNTPOINT
-    try:
-        os.chdir(piddir)
-        for FILE in glob.glob("dhcpcd-*.pid"):
-            f = open(FILE, 'r')
-            pid = f.readline()
-            f.close()
-            cmd = "kill -9 %s" %pid
-            runcmd(cmd)
-            os.remove(FILE)
-        os.chdir(stddir)
-    except:
-        pass
-
-def statgrab(disk):
-    cmd = "statgrab -M disk. |grep %s.write_bytes" % hostoptions["rootdisk"]
-    out = commands.getoutput(cmd)
-    try:
-        prewritebytes = out.split("=")[1].strip()
-    except:
-        prewritebytes = "1024"
-    outline = "STARTSIZE=%s" %prewritebytes
-    f = open('/tmp/.startsize.io',  'w')
-    f.write(str(outline))
-    f.close()
-
-def backup_sql_check():
-    logging.debug("Searching for backup file")
-    try:
-        hostoptions["backupfile"]
-    except:
-        logging.debug("Backup file var is empty")
-        return False
-    if os.path.exists(data_config.MOUNTPOINT+hostoptions["backupfile"]):
-        logging.debug("Backup file %s is present", data_config.MOUNTPOINT+hostoptions["backupfile"])
-        return True
-    else:
-        logging.debug("Backup file %s is NOT present", data_config.MOUNTPOINT+hostoptions["backupfile"])
-        return False
-
-def mdadm_find(PREFIX):
-    logging.debug("Searching for mdadm.conf")
-    if os.path.exists(PREFIX+"/etc/KnoppMyth-version"):
-        mdadmconf = "/etc/mdadm/mdadm.conf"
-    else:
-        mdadmconf = "/etc/mdadm.conf"
-    logging.debug("Using %s for mdadm.conf", mdadmconf)
-    return mdadmconf
-
-def mdadm_assemble_all():
-    # read mdadm.conf and start the arrays
-    #ARRAY /dev/md5 uuid=19464854:03f71b1b:e0df2edd:246cc977
-    logging.debug("Starting mdadm support")
-    mdadmconf_file = mdadm_find("/tmp")
-    cmd = "cdadm --assemble --scan -c /tmp/%s" %mdadmconf_file
-    runcmd(cmd)
-    mdadm_contents = ''
-    try:
-        f = open(mdadmconf_file,  'r')
-        mdadm_contents = f.readlines()
-        f.close()
-    except:
-        logging.debug("     Couldn't open mdadmconf file")
-    for line in mdadm_contents:
-        if line.startswith("ARRAY"):
-            logging.debug("     Found MD array: %s", line)
-            array = line.split()[1]
-            logging.info("      assembling array: %s", array)
-            cmd = "mdadm --assemble -c /tmp%s %s" %(mdadmconf_file, array)
-            runcmd(cmd)
-            time.sleep(2)
-            cmd = "fsck -p %s" %array
-            runcmd
-
-def copy_updates():
-    try:
-        MVROOT = os.environ["MV_ROOT"]
-    except:
-        logging.debug("MVROOT was not defined,  using the default value")
-        MVROOT = "/usr/MythVantage"
-    cp_and_log2(MVROOT+"/bin/", data_config.MOUNTPOINT+MVROOT+"/bin", "*.sh")
-    cp_and_log2(MVROOT+"/bin/", data_config.MOUNTPOINT+MVROOT+"/bin", "*.py")
-
-def timezone_to_db(timefile):
-    logging.info("importing timezone")
-    try:
-        f = open(timefile)
-        timezonecontents = f.readline().strip()
-        f.close()
-    except:
-        logging.debug("Couldn't open /tmp/etc/timezone, will not set the timezone")
-        return
-    update_db("HostTimeZone", timezonecontents);
-    tzsplit = timezonecontents.partition('/')
-    print tzsplit
-    if tzsplit[2]  == '' :
-        update_db("HostTimeZoneRegion", tzsplit[0])
-    else:
-        update_db("HostTimeZoneRegion", tzsplit[0])
-        tztemp="HostTimeZoneRegion_%s" % tzsplit[0]
-        update_db(tztemp, tzsplit[2])
-
-
-
-def cp_and_log(srcfile, destfile):
-    #return
-    if not os.path.exists(srcfile):
-        logging.info("%s is not present,  skipping...", srcfile)
-    else:
-        cmd = ("rsync -arvp %s %s") %(srcfile, destfile)
-        runcmd(cmd)
-
-def cp_and_log2(srcfile, destfile, fileglob):
-    #return
-    logging.debug("cp_and_log2")
-    logging.debug("%s,  %s,  %s", srcfile, destfile,  fileglob)
-
-    if not os.path.exists(srcfile):
-        logging.info("%s is not present,  skipping...", srcfile)
-    else:
-        if fileglob == '':
-            cmd = ("rsync -arvp %s %s") %(srcfile, destfile)
-            runcmd(cmd)
-        else:
-            fileglob = "*"
-            cmd = ("rsync -arvp %s/%s %s") %(srcfile, fileglob, destfile)
-            runcmd(cmd)
-
-def runcmd(cmd):
-    if data_config.NOOPDEBUG == "FALSE":
-        pass
-    else:
-        cmd = "echo "+cmd
-    logging.debug("    %s", cmd)
-    cmdout = commands.getstatusoutput(cmd)
-    logging.debug("    %s", cmdout)
-    return cmdout
-
-def mysqldb(cmd, inchroot):
-    if cmd == "start":
-        mycmd = "  /etc/rc.d/mysqld start"
-    elif cmd == "stop":
-        mycmd = "  /etc/rc.d/mysqld stop"
-    if inchroot == "chroot":
-        mycmd = "  chroot /newboot %s" %mycmd
-    runcmd(mycmd)
-
-
-def mount_bind_chroot():
-    logging.debug("Mounting dev/proc/sysfs for chroot")
-    cmd = "  mount --bind /dev %s" %data_config.MOUNTPOINT+"/dev"
-    runcmd(cmd)
-    cmd = "  mount --bind /dev/pts %s" %data_config.MOUNTPOINT+"/dev/pts"
-    runcmd(cmd)
-    cmd = "  mount --bind /proc %s" %data_config.MOUNTPOINT+"/proc"
-    runcmd(cmd)
-    cmd = "  mount -t sysfs none  %s" %data_config.MOUNTPOINT+"/sys"
-    runcmd(cmd)
-
-
-def umount_bind_chroot():
-    logging.debug("UnMounting dev/proc/sysfs for chroot")
-    cmd = "  umount -l %s" %data_config.MOUNTPOINT+"/dev/pts"
-    runcmd(cmd)
-    cmd = "  umount -l %s" %data_config.MOUNTPOINT+"/dev"
-    runcmd(cmd)
-    cmd = "  umount -l %s" %data_config.MOUNTPOINT+"/proc"
-    runcmd(cmd)
-    cmd = "  umount -l %s" %data_config.MOUNTPOINT+"/sys"
-    runcmd(cmd)
-
-
-def blank_table(diskdevice):
-    logging.debug("    writing new parition table for %s", diskdevice)
-    logging.debug("parition table before:")
-    cmd = "fdisk -l %s" %diskdevice
-    runcmd(cmd)
-
-    cmd = "echo w |fdisk %s" %diskdevice
-    runcmd(cmd)
-
-    logging.debug("parition table after:")
-    cmd = "fdisk -l %s" %diskdevice
-    runcmd(cmd)
-
-def partitions_removeall(diskdevice, label):
-    logging.info("Removing all partitions for %s  %s", label, diskdevice)
-    try:
-        device = parted.getDevice(diskdevice)
-        partdisk = parted.Disk(device)
-        partdisk.deleteAllPartitions()
-        if data_config.NOOPDEBUG == "FALSE":
-            partdisk.commit()
-        for partition in partdisk.partitions:
-            print "type: %s" %partition.type
-    except:
-        logging.debug("   Error reading parition table, attempting to write a blank one")
-        blank_table(diskdevice)
-
-
-def create_partitions(diskdevice, size, ptype, startsector):
-    logging.debug("_____Create partitions______")
-    if size == "NO":
-        logging.info("Size is 0,  skipping")
-        return "NO"
-    partlist = []
-    newstart = 0
-    totalused = 0
-    device = parted.getDevice(diskdevice)
-    partdisk = parted.Disk(device)
-    for partition in partdisk.partitions:
-        if partition.type != parted.PARTITION_FREESPACE:
-            partlist.append((partition,
-                        partition.path,
-                        partition.getFlag(parted.PARTITION_BOOT),
-                        partition.geometry.start,
-                        partition.geometry.end,
-                        partition.geometry.length,
-                        partition.type,
-                        partition.fileSystem))
-    for slice in partlist:
-        (usedpartition,  usedpath,  usedbootable,  usedstart,  usedend,  usedlength,  usedtype,  usedfs) = slice
-        #Start the new partition one after the end of last
-        newstart = usedend+1
-
-    if  startsector == 0:
-        newstart = 0
-    if size == "ALL":
-        logging.debug("     Using the rest of the disk  %s", (device.length-newstart) )
-        try:
-            geom = parted.Geometry(device=device,  start=newstart,  length=(device.length-newstart))
-        except:
-            logging.info("An error occured,  probably invalid parition size")
-            return
-    else:
-        # convert size in MB to a length on the device in sectors
-        length = (int(size) * (1024 * 1024)) / device.sectorSize
-        logging.debug("Size is %s", length)
-        try:
-            geom = parted.Geometry(device=device,  start=newstart,  length=length)
-        except:
-            logging.info("An error occured,  probably invalid parition size")
-            error_out("invalid parition size")
-
-    #collect device constraint
-    constraint = device.getConstraint()
-    # new partition
-    if ptype == "NORMAL":
-        newpart = parted.Partition(disk=partdisk, type=parted.PARTITION_NORMAL,  geometry=geom)
-    elif ptype == "SWAP":
-        newpart = parted.Partition(disk=partdisk, type=parted.PARTITION_NORMAL,  geometry=geom)
-
-    #add the partition to the disk and commit changes
-    partdisk.addPartition(partition=newpart,  constraint=constraint)
-    if data_config.NOOPDEBUG == "FALSE":
-        partdisk.commit()
-    logging.info("created partition %s of %dMB and added it to %s" %
-                (newpart.getDeviceNodeName(),  newpart.getSize(),  diskdevice))
-    return newpart.getDeviceNodeName()
-
-def set_active_parition(diskdevice):
-        """ Set the bootable flag for this partition. """
-        logging.debug("    Setting active parition")
-        device = parted.getDevice(diskdevice)
-        partdisk = parted.Disk(device)
-        try:
-            for partition in partdisk.partitions:
-                partition.setFlag(parted.PARTITION_BOOT)
-            partdisk.commit()
-        except:
-            logging.info("    Couldn't set the active partition")
-            logging.info("    Depending on your system this may not matter")
-
-
-def partition_disk():
-    global hostoptions
-    logging.info("Partitioning")
-    logging.debug("____start of partition_disk____")
-    rootdisk = hostoptions["rootdisk"]
-    datadisk = hostoptions["datadisk"]
-    label = "root"
-    partitions_removeall("/dev/"+rootdisk, label)
-    label = "data"
-    partitions_removeall("/dev/"+datadisk, label)
-    hostoptions["rootpartition"] = create_partitions("/dev/"+rootdisk, hostoptions["rootsize"], "NORMAL", 0)
-    set_active_parition("/dev/"+rootdisk)
-    hostoptions["swappartition"] = create_partitions("/dev/"+rootdisk, hostoptions["swapsize"], "SWAP", 1)
-    if datadisk != rootdisk:
-        hostoptions["datapartition"] = create_partitions("/dev/"+datadisk, hostoptions["datasize"], "NORMAL", 0)
-    else:
-        hostoptions["datapartition"] = create_partitions("/dev/"+datadisk, hostoptions["datasize"], "NORMAL", 1)
-    time.sleep(5)
-
-def fscmd(fstype):
-    fscmds = {"reiserfs":"mkreiserfs -q -l ROOT",  "xfs": "mkfs -t xfs -f",  "ext3": "mkfs.ext3", "jfs":"mkfs.jfs -q", "ext4":"mkfs.ext4", "Do_not_format":"noformat", "no_format":"noformat"}
-    try:
-        rc = fscmds[fstype]
-    except:
-        logging.critical(" %s is not a valid fs type,  exiting now", fstype)
-        error_out("Error mvinstall during format")
-    return rc
-
-
-def format_disk(install_type):
-    logging.info("______Starting Disk Format______")
-    rootfs = fscmd(hostoptions["rootfs"])
-    datafs = fscmd(hostoptions["datafs"])
-
-    rootdisk = hostoptions["rootdisk"]
-    datadisk = hostoptions["datadisk"]
-    rootpartition = hostoptions["rootpartition"]
-    datapartition = hostoptions["datapartition"]
-    if install_type != "upgrade":
-        swapsize = hostoptions["swapsize"]
-        swappartition = hostoptions["swappartition"]
-
-    logging.debug("     Format command for rootfs  %s : %s ",  rootfs, rootpartition)
-    if ( rootfs != "noformat"):
-        logging.info("Starting format of %s", rootpartition)
-        cmd = "  %s /dev/%s" %( rootfs,  rootpartition)
-        #os.system(cmd)
-        runcmd(cmd)
-    else:
-        logging.info("Will not format root partition: %s", rootpartition)
-
-    logging.debug("     Format command for datafs  %s : %s ",  datafs, datapartition)
-    if (datafs != "noformat"):
-        logging.info("Starting format of %s", datapartition)
-        cmd = "  %s /dev/%s" %( datafs,  datapartition)
-        #os.system(cmd)
-        runcmd(cmd)
-    else:
-        logging.info("Will not format data partition: %s",  datapartition)
-
-    if install_type == "install":
-        if (hostoptions["swapsize"] != "NO"):
-            logging.info("Starting format for swap %s", swappartition)
-            cmd = "  mkswap /dev/%s" % swappartition
-            #os.system(cmd)
-            runcmd(cmd)
-        else:
-            logging.debug("     Swap is set to NO,  will not run mkswap")
-
-    logging.debug("_____End of format______")
-
-
-def mount_it():
-    logging.info("______Mounting disk______")
-#   Create mount points
-    try:
-        mountpoint = data_config.MOUNTPOINT
-        mp = mountpoint
-        logging.info("Creating mountpoints %s", mp)
-        os.makedirs(mp)
-    except OSError:
-        logging.debug("     Could not create %s", mp)
-
-#   Mount root
-    cmd = "mount /dev/%s %s"  %(hostoptions["rootpartition"], mountpoint)
-    runcmd(cmd)
-    #logging.debug(cmd)
-    #cmdout=commands.getoutput(cmd)
-    #logging.debug(cmdout)
-#   Mount data
-#make mountpoint after mounting /
-    try:
-        mountpoint = data_config.MOUNTPOINT
-        datapoint = data_config.DATAMOUNT
-        mp = mountpoint+datapoint
-        logging.info("Creating mountpoints %s", mp)
-        os.makedirs(mp)
-    except OSError:
-        logging.debug("     Could not create %s", mp)
-
-    cmd = "mount /dev/%s %s"  %(hostoptions["datapartition"], mp)
-    runcmd(cmd)
-    #logging.debug(cmd)
-    #cmdout=commands.getoutput(cmd)
-    #logging.debug(cmdout)
-
-def unmount_it():
-    logging.info("______Unmounting disk______")
-    cmd = "umount  %s"  %(data_config.MOUNTPOINT+data_config.DATAMOUNT)
-    runcmd(cmd)
-    time.sleep(2)
-
-    cmd = "swapoff /dev/%s" %(hostoptions["swappartition"])
-    runcmd(cmd)
-
-    cmd = "sync"
-    runcmd(cmd)
-
-    cmd = "umount   %s"  %(data_config.MOUNTPOINT)
-    runcmd(cmd)
-    cmd = "sync"
-    runcmd(cmd)
-
-
-def create_squashlist():
-    logging.debug("Creating squashlist")
-    squashfile = data_config.SQUASHFILE
-    f = open(squashfile,  'w')
-    for i in data_config.SQUASHLIST:
-        f.write(i)
-        f.write("\n")
-        logging.debug(i)
-    f.close()
-
-
-def copy_it(install_type):
-    logging.info("______Transferring to disk______")
-    logging.debug(  install_type)
-    if ( install_type == "install"):
-        logging.info("Transferring system")
-        cmd = "  unsquashfs -f -d %s /.livesys/medium/system.sqf" %(data_config.MOUNTPOINT)
-        runcmd(cmd)
-        #logging.debug(cmd)
-        #cmdout=commands.getoutput(cmd)
-
-    if ( install_type == "upgrade"):
-        logging.info("Upgrading system")
-        create_squashlist()
-        cmd = "  unsquashfs -e %s -f -d %s /.livesys/medium/system.sqf" %(data_config.SQUASHFILE,  data_config.MOUNTPOINT)
-        runcmd(cmd)
-        #logging.debug(cmd)
-        #cmdout=commands.getoutput(cmd)
-#   Create the missing dir
-    i = ("sys", "proc", "dev", "tmp", "mnt", "media", "media/cdrom", "media/dvd", "var/log/mythtv")
-    mountpoint = data_config.MOUNTPOINT
-    for item in i:
-        try:
-            mp = mountpoint+"/"+item
-            logging.info("Creating mountpoints %s", mp)
-            os.makedirs(mp)
-        except OSError:
-            logging.debug("     __Could not create %s", mp)
-#   General fixup
-    cmd = "chmod 777 %s/tmp" %(data_config.MOUNTPOINT)
-    runcmd(cmd)
-    cmd = "mknod %s/dev/null c 1 5" %(data_config.MOUNTPOINT)
-    runcmd(cmd)
-    cmd = "mknod %s/dev/console c 5 1" %(data_config.MOUNTPOINT)
-    runcmd(cmd)
-    cmd = "chmod +s  %s/usr/bin/Xorg" %(data_config.MOUNTPOINT)
-    runcmd(cmd)
-    cmd = "chmod +s  %s/usr/bin/crontab" %(data_config.MOUNTPOINT)
-    runcmd(cmd)
-    cmd = "chmod +s  %s/usr/bin/sudo" %(data_config.MOUNTPOINT)
-    runcmd(cmd)
-    cmd = "chmod +s  %s/bin/mount" %(data_config.MOUNTPOINT)
-    runcmd(cmd)
-    logging.debug("__End of copy_it__")
-
-def create_fstab(extralines):
-    logging.debug("______Creating new fstab file_______")
-    logging.info("Creating new fstab file")
-    fstabfile = data_config.MOUNTPOINT+"/etc/fstab"
-    fstab_list = []
-    f = open(fstabfile,  'w')
-    line = '''# <file system>        <dir>         <type>    <options>          <dump> <pass> \n'''
-    fstab_list.append(line)
-    line = '''none                   /dev/pts      devpts    defaults            0      0 \n'''
-    fstab_list.append(line)
-    line = '''none                   /dev/shm      tmpfs     defaults            0      0\n'''
-    fstab_list.append(line)
-    line = '''/dev/sr0 /media/cdrom   auto    ro,user,noauto,unhide   0      0\n'''
-    fstab_list.append(line)
-    line = '''UUID=ROOTUID /  auto defaults,noatime 0 1\n'''
-    fstab_list.append(line)
-    line = '''UUID=DATAUID %s  auto defaults,noatime 0 1\n''' %(data_config.DATAMOUNT)
-    fstab_list.append(line)
-    line = '''UUID=SWAPUID swap swap defaults  0 0 \n'''
-    fstab_list.append(line)
-    for vline in extralines:
-        fstab_list.append(vline)
-    for outline in fstab_list:
-        logging.debug(outline)
-        f.write(outline)
-    f.close()
-
-def find_uuid(partition):
-    logging.info("Finding the UUID for %s...", partition)
-    cmd = "blkid -s UUID /dev/%s" %partition
-    tmpuuid = runcmd(cmd)[1]
-    splituuid = tmpuuid.partition("=")
-    uuid = splituuid[2].replace('"', "")
-    logging.info("The uuid is %s", uuid)
-    return uuid.strip()
-
-def pick_out_vg():
-    logging.info("Searching for Volume Groups in old fstab")
-    vglines = []
-    f = open("/tmp/etc/fstab",  'r')
-    oldfscontents = f.readlines()
-    for line in oldfscontents:
-        if line.startswith("/dev/vg"):
-            vglines.append(line)
-            templine = line.split()
-            mdir = templine[1]
-            if not os.path.exists (mdir):
-                logging.debug("Creating dir %s for VG mount", mdir)
-                os.makedirs (mdir)
-#               Might need to os.chown to mythtv:users
-            else:
-                logging.debug("Directory %s for VG mount already present", mdir)
-    return vglines
-
-def fstab_it(install_type):
-    logging.info("______Checking fstab______")
-    kmvg = []
-    fstabfile = data_config.MOUNTPOINT+"/etc/fstab"
-#   Check for knoppmyth install,  if found create new
-    if install_type == "upgrade":
-        if os.path.exists("/tmp/etc/KnoppMyth-version"):
-            logging.debug("     KnoppMyth-Version found,  creating new fstab")
-            kmvg = pick_out_vg()
-            create_fstab(kmvg)
-        elif os.path.exists("/tmp/etc/fstab"):
-            logging.debug("     Upgrade and not Knoppmyth,  using old fstab")
-            cp_and_log("/tmp/etc/fstab", fstabfile)
-#   Catch all for creating new fstab
-    if not os.path.exists(data_config.MOUNTPOINT+"/etc"):
-        os.makedirs(data_config.MOUNTPOINT+"/etc")
-    if not os.path.exists(fstabfile):
-        create_fstab(kmvg)
-
-    logging.info("____UUID check for %s",  "swap")
-    swapuuid = find_uuid(hostoptions["swappartition"])
-
-    logging.info("____UUID check for %s",  "data")
-    datauuid = find_uuid(hostoptions["datapartition"])
-
-    logging.info("____UUID check for %s",  "root")
-    rootuuid = find_uuid(hostoptions["rootpartition"])
-
-    fstabfile = data_config.MOUNTPOINT+"/etc/fstab"
-    logging.info("Correcting UUID's in %s", fstabfile)
-    f = open(fstabfile,  'r')
-    oldfscontents = f.readlines()
-    newfstab = []
-    f.close()
-    for line in oldfscontents:
-        if line.startswith("UUID"):
-            templine = line.split()
-            if ( templine[1] == "/"):
-                logging.debug("     Found Root fstab line:")
-                logging.debug(      templine)
-                templine[0] = "UUID=%s" %(rootuuid)
-                newline = ''
-                for i in templine:
-                    newline+=i
-                    newline+="    "
-                newline+="\n"
-                logging.debug("     New fstab line:")
-                logging.debug(      newline)
-                newfstab.append(newline)
-
-            if ( templine[1] == data_config.DATAMOUNT):
-                logging.debug("     Found DATA mount")
-                logging.debug(      templine)
-                templine[0] = "UUID=%s" %(datauuid)
-                newline = ''
-                for i in templine:
-                    newline+=i
-                    newline+="    "
-                newline+="\n"
-                logging.debug("     New fstab line:")
-                logging.debug(      newline)
-                newfstab.append(newline)
-
-            if ( templine[1] == "swap"):
-                if len(swapuuid) <= 5:
-                    logging.debug("     swapp uuid is to small")
-                else:
-                    logging.debug("     Found swap partition")
-                    logging.debug(      templine)
-                    templine[0] = "UUID=%s" %(swapuuid)
-                    newline = ''
-                    for i in templine:
-                        newline+=i
-                        newline+="    "
-                    newline+="\n"
-                    logging.debug("     New fstab line:")
-                    logging.debug(      newline)
-                    newfstab.append(newline)
-        else:
-            logging.debug("     Line didn't match,  adding to newfstab:")
-            logging.debug(      line)
-            newfstab.append(line)
-    logging.info("Writing out newfstab")
-    logging.debug("______This is the new fstab_____")
-    f = open(fstabfile,  'w')
-    for line in newfstab:
-        logging.debug(line)
-        f.write(line)
-        #f.write("\n")
-    f.close()
-
-def grub_it():
-    logging.info("______Start of grub install______")
-    cmd = "  grub-install --recheck --no-floppy --root-directory=%s \"(hd0)\" "  % data_config.MOUNTPOINT
-    logging.info("Running grub-install")
-    runcmd(cmd)
-    rootuuid = find_uuid(hostoptions["rootpartition"])
-    cmd = "  mkinitcpio -g %s/boot/kernel26.img" % data_config.MOUNTPOINT
-    logging.info("Running mkinitcpio")
-    runcmd(cmd)
-    logging.info("Adding root uuid to grub menu")
-    grubfile = data_config.MOUNTPOINT+"/boot/grub/menu.lst"
-    try:
-        f = open(grubfile,  'r')
-        oldgrub = f.readlines()
-        newgrub = []
-        f.close()
-        for line in oldgrub:
-            if line.startswith("kernel"):
-                templine = line.split()
-                logging.debug("     Found kernel Root grubline:")
-                logging.debug(      templine)
-                templine[2] = "root=/dev/disk/by-uuid/%s" %(rootuuid)
-                newline = ''
-                for i in templine:
-                    newline+=i
-                    newline+="    "
-                newline+="\n"
-                logging.debug("     New grub menu.lst  line:")
-                logging.debug(      newline)
-                newgrub.append(newline)
-            else:
-                logging.debug("Line didn't match,  adding to newgrub:")
-                logging.debug(      line)
-                newgrub.append(     line)
-        logging.info("Writing out new grub file")
-        logging.debug("______This is the new grub_____")
-        f = open(grubfile,  'w')
-        for line in newgrub:
-            logging.debug(line)
-            f.write(line)
-        f.close()
-    except:
-        logging.debug("Couldn't open grub file")
-
-def fix_permissions():
-    logging.info("Fixing permissions")
-    SE = os.environ["TEMPLATES"]+"/settings/syssettings"
-    cmd = "  chmod -R 755  %s" %(data_config.MOUNTPOINT+SE)
-    runcmd(cmd)
-    cmd = "  chmod 775  %s" %(data_config.MOUNTPOINT+"/etc/systemconfig")
-    runcmd(cmd)
-    cmd = "  chmod 755  %s" %(data_config.MOUNTPOINT+"/root")
-    runcmd(cmd)
-    cmd = "  chown root:mythtv  %s" %(data_config.MOUNTPOINT+"/etc/systemconfig")
-    runcmd(cmd)
-    cmd = "  chown -R mythtv:mythtv  %s" %(data_config.MOUNTPOINT+SE)
-    runcmd(cmd)
-    cmd = "  chown -R mythtv:mythtv  %s" %(data_config.MOUNTPOINT+"/var/log/mythtv")
-    runcmd(cmd)
-
-def apply_new_auth():
-    logging.info("_____Applying Password updates_______")
-    passfile = "/root/myth_user_call.out"
-    try:
-        MVROOT = os.environ["MV_ROOT"]
-    except:
-        logging.debug("MVROOT was not defined,  using the default value")
-        MVROOT = "/usr/MythVantage"
-    if data_config.NOOPDEBUG == "FALSE":
-        cmdprefix = "chroot " + data_config.MOUNTPOINT + " " + MVROOT+"/bin/myth_user_call -i "
-    else:
-        cmdprefix = "echo chroot " + data_config.MOUNTPOINT + " " + MVROOT+"/bin/myth_user_call -i "
-    try:
-        f = open(passfile,  'r')
-        passcmds = f.readlines()
-        f.close()
-        for cmd in passcmds:
-            execmd = cmdprefix+cmd
-#            Using os.system because runcmd fails
-            logging.debug(execmd)
-            os.system(execmd)
-    except:
-        logging.debug("Applying password updates failed,  couldn't open %s", passfile)
-    logging.debug
-
-def add_to_blacklist(module):
-    rcfile = data_config.MOUNTPOINT + "/etc/rc.conf"
-    logging.debug("    Attempting to add %s to blacklist", module)
-    newline=''
-    try:
-        f = open(rcfile, 'r')
-        conflines = f.readlines()
-        f.close()
-    except:
-        logging.critical("    *Couldn't open %s for reading",rcfile)
-        return
-
-    try:
-        f = open(rcfile, 'w')
-    except:
-        logging.critical("    *Couldn't open %s for reading",rcfile)
-        return
-
-    for line in conflines:
-        newline = line
-        if re.match("MOD_BLACKLIST",line):
-            logging.debug(line)
-            try:
-                lastpar = line.rindex(')')
-                logging.debug("    found ) at %s", lastpar)
-                newline = line[:lastpar] +" !" + module + " " + line[lastpar:]
-                logging.debug(newline)
-            except:
-                logging.debug("Couldn't find ending )")
-                newline = line
-        f.write(newline)
-    f.close()
-
-
-def add_to_modulelist(module):
-    rcfile = data_config.MOUNTPOINT + "/etc/rc.conf"
-    logging.debug("    Attempting to add %s to modulelist", module)
-    newline=''
-    try:
-        f = open(rcfile, 'r')
-        conflines = f.readlines()
-        f.close()
-    except:
-        logging.critical("    *Couldn't open %s for reading",rcfile)
-        return
-
-    try:
-        f = open(rcfile, 'w')
-    except:
-        logging.critical("    *Couldn't open %s for reading",rcfile)
-        return
-
-    for line in conflines:
-        newline = line
-        if re.match("MODULES=",line):
-            logging.debug(line)
-            try:
-                lastpar = line.rindex(')')
-                logging.debug("    found ) at %s", lastpar)
-                newline = line[:lastpar] +" " + module + " " + line[lastpar:]
-                logging.debug(newline)
-            except:
-                logging.debug("Couldn't find ending )")
-                newline = line
-        f.write(newline)
-    f.close()
-
-
-
-def special_hardware_check():
-    logging.info("_____Applying special boot parameters_______")
-    try:
-        f = open('/proc/cmdline', 'r')
-        bootoptions = f.readlines()
-        f.close()
-    except:
-        logging.critical("    *Couldn't open /proc/cmdline")
-        return
-    bootoptions =  bootoptions[0].split()
-    logging.debug("    Boot options: %s", bootoptions)
-    for item in bootoptions:
-        logging.debug(item)
-        if re.match("disablemodules",item) != None :
-            logging.debug("    Found disabledmodules")
-            modulelist = item.split("=")[1]
-            for module in modulelist.split(','):
-                add_to_blacklist(module)
-
-        if re.match("modules",item) != None :
-            logging.debug("    Found modules")
-            modulelist = item.split("=")[1]
-            for module in modulelist.split(','):
-                add_to_modulelist(module)
-
-        if re.match("type",item) != None :
-            logging.debug("    Found special hardware type")
-            try:
-                typefile = open(data_config.MOUNTPOINT + "/myth/.special_hardware_type", 'w')
-                typelist = item.split("=")[1]
-                # there should be only one special hardware type, but this will handle multiples, just in case
-                for type in typelist.split(','):
-                    typefile.write(type)
-                    typefile.write("\n")
-                typefile.close()
-            except:
-                logging.debug("Couldn't write to file: ", typefile)
-        if re.match("no_meth",item) != None :
-          cmd = "  touch %s%s/.no_meth" %(data_config.MOUNTPOINT, data_config.MYTHHOME)
-          runcmd(cmd)
-
-def swapsearch():
-#currently unused!
-    partlist = []
-    stddir = os.getcwd()
-    os.chdir("/sys/block")
-    partitionlist = glob.glob("*")
-    for item in partitionlist:
-        try:
-            newitem = item.strip().rpartition(" ")[2]
-            if (not newitem == '') and  (not newitem.startswith("loop")):
-                path = "/dev/"+newitem.strip()
-                path = path.strip()
-                device = parted.getDevice(path)
-                (cylinders,  heads,  sectors) = device.biosGeometry
-                sizeInBytes = device.length * device.sectorSize
-                disk = parted.Disk(device)
-                for partition in disk.partitions:
-                    if partition.type == parted.PARTITION_PROTECTED or \
-                    partition.type == parted.PARTITION_METADATA or \
-                    partition.type == parted.PARTITION_FREESPACE:
-                        continue
-
-                    partlist.append((partition,
-                                    partition.path,
-                                    partition.getFlag(parted.PARTITION_BOOT),
-                                    partition.geometry.start,
-                                    partition.geometry.end,
-                                    partition.geometry.length,
-                                    partition.type,
-                                    partition.fileSystem))
-                for slice in partlist:
-                    (partition,  path,  bootable,  start,  end,  length,  type,  fs) = slice
-                    if partition.getFlag(parted.PARTITION_SWAP) or fs.type == "linux-swap":
-                        print "found swap"
-                        print path
-        except:
-            pass
-    os.chdir(stddir)
-
-def sane_settings(file):
-    #Remove some settings from file_name
-    removeline = ("HOSTrootfstype",  "HOSTrootfstype",  "HOSTdatafstype",  "HOSTOSsize",  "HostUseALLdata",  "HOSTDATAsize",  "HOSTuprootfstype",  "HostUseSWAP",  "HOSTSWAPsize")
-    logging.debug("__Running sane settings")
-    try:
-        f = open(file,  'r')
-        filecontents = f.readlines()
-        f.close()
-    except:
-        logging.debug("     Couldn't find file %s to sane", file)
-    try:
-        f = open(file, 'w')
-        for line in filecontents:
-            for item in removeline:
-                if line.startsize(line.strip()):
-                    logging.debug("     Found a line to remove in %s,  %s", file, line)
-                else:
-                    f.write(line)
-    except:
-        logging.debug("     Couldn't open file %s for writing", file)
-    logging.debug("     __End  sane settings")
-
-def restore_default_settings():
-    try:
-        MVROOT = os.environ["MV_ROOT"]
-    except:
-        logging.debug("     MVROOT was not defined,  using the default value")
-        MVROOT = "/usr/MythVantage"
-    logging.info("Saving syssettings")
-    cmd = "%s/bin/restore_default_settings.sh -c save -t syssettings -h %s -d localhost" %(MVROOT, data_config.MVHOSTNAME)
-    runcmd(cmd)
-    SE = os.environ["TEMPLATES"]+"/settings/syssettings/"
-    cp_and_log(SE, data_config.MOUNTPOINT+SE)
-    cp_and_log("/etc/mtab", data_config.MOUNTPOINT+"/etc/mtab")
-    copy_updates()
-    fix_permissions()
-
-def full_install(hostoptions):
-    logging.info("______Start of full install______")
-    try:
-        MVROOT = os.environ["MV_ROOT"]
-    except:
-        logging.debug("     MVROOT was not defined,  using the default value")
-        MVROOT = "/usr/MythVantage"
-
-    try:
-        os.remove("/tmp/.this_is_upgrade")
-    except OSError:
-        logging.debug("     File /tmp/.this_is_upgrade not present,  couldn't delete it")
-        pass
-#   Partition disk
-    statusmsg = "Partitioning %s"  %( hostoptions["rootdisk"])
-    update_status(statusmsg)
-    progress(1)
-    if data_config.NOOPDEBUG == "FALSE":
-        partition_disk()
-    else:
-        logging.debug("     Debug mode,  skipping partitioning step")
-
-#   Format disk
-    statusmsg = "Preparing  %s"  %( hostoptions["rootdisk"])
-    update_status(statusmsg)
-    progress(2)
-    format_disk("install")
-
-
-#   Mount partitions
-    statusmsg = "Mounting  %s"  %( hostoptions["rootdisk"])
-    update_status(statusmsg)
-    progress(3)
-    mount_it()
-
-#   Find number of bytes written to disk before starting copy.  This is used
-#   to have a somewhat decent progress indication.
-    statgrab( hostoptions["rootdisk"])
-    msg = "Creating %s" %(systemconfig["hostname"])
-    update_status(msg)
-
-#   Copy system to disk
-    copy_it("install")
-#   Remove old fstab so that a new one is created
-    fstabfile = data_config.MOUNTPOINT+"/etc/fstab"
-    try:
-        os.remove(fstabfile)
-    except OSError:
-        logging.debug("     ERROR: deleting %s", fstabfile)
-    fstab_it("full_install")
-#   Configure system
-    msg = "Configuring system"
-    update_status(msg)
-    progress(98)
-    grub_it()
-    special_hardware_check()
-#   Configuring the system
-    logging.info("______Configuring system________")
-    cp_and_log("/etc/systemconfig", data_config.MOUNTPOINT+"/etc/systemconfig")
-    cp_and_log("/root/xorg.conf.install", data_config.MOUNTPOINT+"/etc/X11/xorg.conf.install")
-    restore_default_settings()
-    #try:
-        #MVROOT=os.environ["MV_ROOT"]
-    #except:
-        #logging.debug("     MVROOT was not defined,  using the default value")
-        #MVROOT="/usr/MythVantage"
-    #logging.info("Saving syssettings")
-    #cmd="%s/bin/restore_default_settings.sh -c save -t syssettings -h %s -d localhost" %(MVROOT, data_config.MVHOSTNAME)
-    #runcmd(cmd)
-    #SE=os.environ["TEMPLATES"]+"/settings/syssettings"
-    #cp_and_log(SE, data_config.MOUNTPOINT+SE)
-    #cp_and_log("/etc/mtab", data_config.MOUNTPOINT+"/etc/mtab")
-    #cp_and_log2(MVROOT+"/bin/", data_config.MOUNTPOINT+MVROOT+"/bin/", "*.sh")
-    #cp_and_log2(MVROOT+"/bin/", data_config.MOUNTPOINT+MVROOT+"/bin/", "*.py")
-    #fix_permissions()
-    mount_bind_chroot()
-    apply_new_auth()
-    umount_bind_chroot()
-    if ( systemconfig["SystemType"] == "Master_backend" or  systemconfig["SystemType"] == "Standalone" ):
-#       This install will need a DB,  so install it
-        logging.info("______Installing Database in CHROOT________")
-        mysqldb("stop", '')
-        mount_bind_chroot()
-        cmd = "  chroot %s %s/bin/install_db_chroot.sh |tee /tmp/chrootdb.out" %(data_config.MOUNTPOINT, MVROOT)
-        runcmd(cmd)
-        logging.info("Running systemconfig in chroot")
-        #cmd = "  chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT)
-        cmd = "chroot %s %s/bin/systemconfig.sh all,this_is_install" %(data_config.MOUNTPOINT, MVROOT)
-        rc = runcmd(cmd)[0]
-        if rc != 0 :
-            error_out("Running systemconfig")
-
-        mysqldb("stop", "chroot")
-        kill_dhcp_chroot()
-        logging.info("____End Database in CHROOT____")
-        mysqldb("start", '')
-        umount_bind_chroot()
-    else:
-        logging.info("______No database required,  continuing configuration________")
-        mount_bind_chroot()
-        cmd = "  chroot %s DISPLAY=127.0.0.1:0 %s/bin/MythVantage -t restore, default 1" %(data_config.MOUNTPOINT, MVROOT)
-        runcmd(cmd)
-#       Need to check for to touch  /tmp/.dbsysfailed
-        cmd = "  chroot %s %s/bin/restore_default_settings.sh -c restore  -t syssettings " %(data_config.MOUNTPOINT, MVROOT)
-        runcmd(cmd)
-        if ( 'x' == '1' ):
-            logging.debug("touching /tmp/.dbsysfailed")
-        else:
-            #cmd = "  chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT)
-            cmd = "chroot %s %s/bin/systemconfig.sh all,this_is_install" %(data_config.MOUNTPOINT, MVROOT)
-            rc = runcmd(cmd)[0]
-            if rc != 0 :
-                error_out("Running systemconfig")
-            cmd = "chroot %s %s/bin/restore_default_settings.sh -c ACCESSCONTROL " %(data_config.MOUNTPOINT, MVROOT)
-            runcmd(cmd)
-        umount_bind_chroot()
-    cmd = "  touch %s%s/.configure" %(data_config.MOUNTPOINT, data_config.MYTHHOME)
-    runcmd(cmd)
-    cmd = "  chmod 777 %s%s/.configure" %(data_config.MOUNTPOINT, data_config.MYTHHOME)
-    runcmd(cmd)
-
-    msg = "Done"
-    update_status(msg)
-    cp_and_log("/tmp/mythvantage_install.log", data_config.MOUNTPOINT+"/var/log/mythvantage_install.log")
-    cp_and_log("/tmp/mv_debug.log", data_config.MOUNTPOINT+"/var/log/mv_debug.log")
-    unmount_it()
-    logging.debug("_____End of full install_____")
-
-def find_upgrade():
-    logging.info("_____Start of find_upgrade_____")
-    global hostoptions
-    #try to mount first partition of disk
-    #copy old /etc/systemconfig to live,  import settings into db
-    #umount drive.
-    #check for clean upgrade
-    if ( clean_upgrade() ):
-        logging.info("Clean upgrade requested,  not using old data")
-        return
-    mount_it()
-    oldbackupfile = data_config.MOUNTPOINT+"/root/backup/"+data_config.BACKUPFILE
-    newbackupfile = "/tmp/"+data_config.BACKUPFILE
-    if os.path.exists(oldbackupfile):
-        logging.debug("Setting backup file to %s", newbackupfile)
-        hostoptions["backupfile"] = newbackupfile
-        cp_and_log(oldbackupfile, newbackupfile)
-
-    srcfile = data_config.MOUNTPOINT+"/etc/systemconfig"
-    logging.info("Searching for systemconfig file %s", srcfile)
-    if os.path.exists(srcfile):
-        logging.info("Found systemconfig file %s", srcfile)
-        TEMPLATES = os.environ["TEMPLATES"]+"/settings/syssettings"
-        cp_and_log2(data_config.MOUNTPOINT+TEMPLATES, data_config.TEMP_TEMPLATES, '')
-        sane_settings("/tmp/templates/settings/syssettings/settings.txt")
-        cp_and_log2(data_config.TEMP_TEMPLATES, TEMPLATES, '')
-        cp_and_log(srcfile, "/etc/systemconfig")
-        cp_and_log(data_config.MOUNTPOINT+"/etc/", "/tmp/etc/")
-        cp_and_log(data_config.MOUNTPOINT+"/var/lib/alsa/", "/tmp/alsa")
-        cp_and_log(data_config.MOUNTPOINT+"/var/lib/oss/", "/tmp/oss")
-        cp_and_log("/tmp/etc/mdadm.conf", "/etc/mdadm.conf")
-    else:
-        logging.info("Could not find systemconfig file %s", srcfile)
-        cp_and_log(data_config.MOUNTPOINT+"/etc/", "/tmp/etc/")
-        cp_and_log(data_config.MOUNTPOINT+"/var/lib/alsa/", "/tmp/alsa")
-        cp_and_log("/tmp/etc/mdadm.conf", "/etc")
-        timezone_to_db("/tmp/etc/timezone")
-    unmount_it()
-    logging.debug("End of find_upgrade")
-
-def upgrade_mount_search():
-    #Search for data/myth partition based on contents of fstab
-    logging.debug("______Start of upgrade_mount_search_____")
-    cmd = "umount %s%s"  %(data_config.MOUNTPOINT, data_config.DATAMOUNT)
-    runcmd(cmd)
-    fstab_list = []
-    fstab_data_mount = ''
-    try:
-        f = open("/tmp/etc/fstab",  'r')
-        oldfscontents = f.readlines()
-        f.close()
-        ##    ['UUID=',  '/myth',  'auto',  'defaults, noatime',  '0',  '1']
-        #for line in oldfscontents:
-            #mountdir=line.split()
-            #if mountdir[1] == (data_config.DATAMOUNT):
-                #fstablist.append(mountdir)
-    except:
-        logging.debug("    Couldn't open /tmp/etc/fstab")
-    for line in oldfscontents:
-        if line.startswith("#"):
-            continue
-        mountdir=line.split()
-        try:
-            if mountdir[1] == (data_config.DATAMOUNT):
-                fstablist.append(mountdir)
-        except:
-            continue
-    #search fstab for data/myth mountpoint
-    for i in fstab_list:
-        if i[1] == data_config.DATAMOUNT:
-            fstab_data_mount = i[0]
-            break
-
-    #start software raid support if needed
-    for i in fstab_list:
-        if i[0].startswith("/dev/md"):
-            logging.debug("    starting software raid support")
-            mdadm_assemble_all
-
-
-    if re.search("UUID", fstab_data_mount):
-        fstab_data_uuid = fstab_data_mount.split("=")[1]
-        cmd = "blkid -t UUID=%s" %fstab_data_uuid
-        retcode = call(cmd,  shell=True)
-        if retcode != 0:
-            logging.debug("    Couldn't find uuid %s,  starting md support", fstab_data_uuid)
-            mdadm_assemble_all
-        #hoping everything is up and running and data/myth will be available for mount
-        cmd = "mount -U %s %s" %(fstab_data_uuid, data_config.MOUNTPOINT)
-        runcmd(cmd)
-        cmd = "blkid -t UUID=%s|cut -d: -f1" %fstab_data_uuid
-        logging.debug(cmd)
-        datadisk = commands.getoutput(cmd)
-        cmd = "basename %s" %datadisk
-        datadisk = commands.getoutput(cmd)
-    else:
-        cmd = "mount  %s %s" %(fstab_data_mount, data_config.MOUNTPOINT)
-        runcmd(cmd)
-        cmd = "basename %s" %fstab_data_mount
-        datadisk = commands.getoutput(cmd)
-    time.sleep(3)
-#    hostoptions["backupfile"]=data_config.BACKUPPATH+data_config.BACKUPFILE
-    if not backup_sql_check():
-        newbackupfile = "/tmp/"+data_config.BACKUPFILE
-        if os.path.exists(newbackupfile):
-            logging.debug("Setting backup file to %s", newbackupfile)
-            cp_and_log(newbackupfile, data_config.MOUNTPOINT+newbackupfile)
-            hostoptions["backupfile"] = newbackupfile
-        else:
-            logging.info("Couldn't find any database to restore,  upgrade will continue with a new database")
-
-
-
-def upgrade(hostoptions):
-
-    try:
-        MVROOT = os.environ["MV_ROOT"]
-    except:
-        logging.debug("MVROOT was not defined,  using the default value")
-        MVROOT = "/usr/MythVantage"
-    logging.info("______Start of upgrade______")
-    cmd = "touch /tmp/.this_is_upgrade"
-    runcmd(cmd)
-    if hostoptions["rootfs"] == "Do_not_format":
-        logging.info("Will not format root filesystem")
-    else:
-        statusmsg = "Preparing  %s"  %( hostoptions["rootdisk"])
-        update_status(statusmsg)
-        progress(2)
-        format_disk("upgrade")
-    #sys.exit(2)
-    statusmsg = "Mounting  %s"  %( hostoptions["rootdisk"])
-    update_status(statusmsg)
-    progress(3)
-    mount_it()
-    hostoptions["backupfile"] = data_config.BACKUPPATH+data_config.BACKUPFILE
-    statgrab( hostoptions["rootdisk"])
-    msg = "Upgrading %s" %(systemconfig["hostname"])
-    update_status(msg)
-    time.sleep(3)
-    copy_it("upgrade")
-    cmd = "rm -rf %s/etc.old" %data_config.MOUNTPOINT
-    runcmd(cmd)
-    cmd = "rm -rf %s/alsa.old" %data_config.MOUNTPOINT
-    runcmd(cmd)
-
-    cp_and_log("/tmp/etc/", data_config.MOUNTPOINT+"/etc.old/")
-    cp_and_log("/tmp/alsa/", data_config.MOUNTPOINT+"/alsa.old/")
-    cp_and_log("/tmp/oss", data_config.MOUNTPOINT+"/var/lib/oss.old")
-
-    srcfile = "%s/etc.old/ssh/" %(data_config.MOUNTPOINT)
-    destfile = "%s/etc/ssh/" %(data_config.MOUNTPOINT)
-    cp_and_log2(srcfile, destfile, '*.pub')
-    cp_and_log2(srcfile, destfile, '*.key')
-    cp_and_log2(srcfile, destfile, '*key')
-
-    mdfile = mdadm_find("/tmp")
-    cp_and_log("/tmp"+mdfile, data_config.MOUNTPOINT+"/etc")
-
-    srcfile = "%s/etc.old/asound.conf" %(data_config.MOUNTPOINT)
-    destfile = "%s/etc/asound.conf" %(data_config.MOUNTPOINT)
-    cp_and_log(srcfile, destfile)
-
-    # R5.5 -> R6
-    srcfile = "%s/alsa.old/asound.state" %(data_config.MOUNTPOINT)
-    destfile = "%s/etc/asound.state" %(data_config.MOUNTPOINT)
-    cp_and_log(srcfile, destfile)
-    # R6 -> R6
-    srcfile = "%s/etc.old/asound.state" %(data_config.MOUNTPOINT)
-    destfile = "%s/etc/asound.state" %(data_config.MOUNTPOINT)
-    cp_and_log(srcfile, destfile)
-
-    srcfile = "%s/etc.old/mplayer/mplayer.conf" %(data_config.MOUNTPOINT)
-    destfile = "%s/etc/mplayer/mplayer.conf" %(data_config.MOUNTPOINT)
-    cp_and_log(srcfile, destfile)
-
-    if not os.path.exists("/tmp/etc/KnoppMyth-version"):
-        logging.debug("    standard upgrade,  restoring auth files")
-        cp_and_log(data_config.MOUNTPOINT+"/etc.old/passwd", data_config.MOUNTPOINT+"/etc/passwd")
-        cp_and_log(data_config.MOUNTPOINT+"/etc.old/shadow", data_config.MOUNTPOINT+"/etc/shadow")
-        cp_and_log(data_config.MOUNTPOINT+"/etc.old/group", data_config.MOUNTPOINT+"/etc/group")
-    msg = "Configuring system"
-
-    update_status(msg)
-    progress(98)
-    logging.info("______Configuring system________")
-    cp_and_log("/etc/systemconfig", data_config.MOUNTPOINT+"/etc/systemconfig")
-    if not backup_sql_check():
-        upgrade_mount_search()
-    fstab_it("upgrade")
-    time.sleep(1)
-    grub_it()
-    time.sleep(1)
-    #needed to get around a bug with pacman
-    special_hardware_check()
-    cp_and_log("/root/xorg.conf.install", data_config.MOUNTPOINT+"/etc/X11/xorg.conf.install")
-    cp_and_log("/etc/mtab", data_config.MOUNTPOINT+"/etc/mtab")
-    if clean_upgrade() or os.path.exists("/tmp/etc/KnoppMyth-version"):
-        logging.debug("clean upgrade or knoppmyth upgrade detected,  running restore settings")
-        restore_default_settings()
-        if clean_upgrade():
-            file = "%s/%s/.kmupgrade" %(data_config.MOUNTPOINT, data_config.MYTHHOME)
-            cmd = "touch %s && chmod 777 %s" %(file, file)
-            runcmd(cmd)
-    copy_updates()
-    fix_permissions()
-    mount_bind_chroot()
-    logging.info("Running systemconfig in chroot")
-    #cmd = "  chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT)
-    cmd = "chroot %s %s/bin/systemconfig.sh all,this_is_install" %(data_config.MOUNTPOINT, MVROOT)
-    rc = runcmd(cmd)[0]
-    if rc != 0 :
-        error_out("Running systemconfig")
-    mysqldb("stop", "")
-    if ( systemconfig["SystemType"] == "Master_backend" or  systemconfig["SystemType"] == "Standalone" ):
-        if clean_upgrade() or not backup_sql_check():
-            logging.info("Installing new database")
-            cmd = "  chroot %s %s/bin/install_db_chroot.sh |tee /tmp/chrootdb.out" %(data_config.MOUNTPOINT, MVROOT)
-            runcmd(cmd)
-        else:
-            logging.info("Restoring database")
-            cmd = "  chroot %s %s/bin/restore_km_db_chroot.sh %s|tee /tmp/chrootdb.out" %(data_config.MOUNTPOINT, MVROOT, hostoptions["backupfile"])
-            runcmd(cmd)
-
-    if os.path.exists("/tmp/etc/KnoppMyth-version"):
-        cmd = "  chroot %s %s/bin/restore_default_settings.sh -c restore  -t hostsettings " %(data_config.MOUNTPOINT, MVROOT)
-        runcmd(cmd)
-        logging.debug("Correcting permissions because of km->linhes upgrade")
-        cmd = "  chown -R mythtv:mythtv  %s" %(data_config.MOUNTPOINT+data_config.DATAMOUNT)
-        runcmd(cmd)
-        cmd = "  chown -R root:root  %s" %(data_config.MOUNTPOINT+data_config.DATAMOUNT+"/backup")
-        runcmd(cmd)
-    else:
-        cmd = "  chroot %s %s/bin/restore_default_settings.sh -c restore  -t syssettings " %(data_config.MOUNTPOINT, MVROOT)
-        runcmd(cmd)
-
-    logging.info("Running systemconfig in chroot 2nd time")
-    #cmd = "  chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT)
-    cmd = "chroot %s %s/bin/systemconfig.sh all,this_is_install" %(data_config.MOUNTPOINT, MVROOT)
-    rc = runcmd(cmd)[0]
-    if rc != 0 :
-        error_out("Running systemconfig")
-    #logging.info("Running systemconfig in chroot")
-    #cmd = "  chroot %s %s/bin/systemconfig.sh advanced" %(data_config.MOUNTPOINT, MVROOT)
-    #runcmd(cmd)
-    mysqldb("stop", 'chroot')
-    apply_new_auth()
-    kill_dhcp_chroot()
-    umount_bind_chroot()
-    cp_and_log("/tmp/mythvantage_install.log", data_config.MOUNTPOINT+"/var/log/mythvantage_install.log")
-    cp_and_log("/tmp/mv_debug.log", data_config.MOUNTPOINT+"/var/log/mv_debug.log")
-    unmount_it()
-    msg = "Done"
-    update_status(msg)
-    mysqldb("start", '')
-
-
-
-
-def main(argv):
-    global hostoptions
-    try:
-        opts,  args = getopt.getopt(argv,  'c:h',  ["help",  "rootdisk=",  "rootfs=",  "rootsize=",  "datafs=",  "datasize=",  "datadisk=",  "swapsize=",  "datapartition=" ] )
-    except getopt.GetoptError, why:
-        print why
-        usage()
-        sys.exit(2)
-    hostoptions = {"op": 'null'}
-    for opt,  arg in opts:
-        if opt in ("-h",  "--help"):
-            usage()
-            sys.exit(0)
-        elif opt in ( "--rootdisk"):
-            hostoptions["rootdisk"] = arg
-            hostoptions["rootpartition"] = arg+str(1)
-        elif opt in ("--rootfs"):
-            hostoptions["rootfs"] = arg
-        elif opt in ("--rootsize"):
-            hostoptions["rootsize"] = arg
-        elif opt in ("--datafs"):
-            hostoptions["datafs"] = arg
-        elif opt in ("--datasize"):
-            hostoptions["datasize"] = arg
-        elif opt in ("--datadisk"):
-            hostoptions["datadisk"] = arg
-        elif opt in ("--datapartition"):
-            hostoptions["datapartition"] = arg
-        elif opt in ("--swapsize"):
-            hostoptions["swapsize"]  = arg
-
-        elif opt in ("-c"):
-            validop = ["full_install", "upgrade", "netboot", "find_upgrade"]
-            if arg not in validop:
-                logging.critical("-c %s is not a valid option", arg)
-                sys.exit(2)
-            else:
-                hostoptions["op"]  = arg
-    try:
-        hostoptions["datadisk"]
-    except:
-        hostoptions["datadisk"] = hostoptions["rootdisk"]
-        hostoptions["datapartition"] = hostoptions["datadisk"]+str(3)
-    try:
-        hostoptions["datapartition"]
-    except:
-        hostoptions["datapartition"] = hostoptions["datadisk"]+str(3)
-    hostoptions["swappartition"]  =  hostoptions["rootdisk"] + str(2)
-
-
-    if ( hostoptions["op"]  == "full_install" ) :
-        full_install(hostoptions)
-    elif (hostoptions["op"]  == "upgrade" ) :
-        hostoptions["datafs"] = "no_format"
-        find_upgrade()
-        upgrade(hostoptions)
-    elif (hostoptions["op"]  == "find_upgrade" ) :
-        find_upgrade()
-    return hostoptions
-
-
-#____________________________________________setup the logging______________________________________________________
-LOG_FILENAME = '/tmp/mv_status.log'
-DEBUGLOG = '/tmp/mv_debug.log'
-logging.basicConfig(level=logging.DEBUG,
-                    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
-                    datefmt='%m-%d %H:%M',
-                    filename=DEBUGLOG,
-                    filemode='a')
-# define a Handler which writes INFO messages or higher to the sys.stderr
-console = logging.StreamHandler()
-console.setLevel(logging.INFO)
-# set a format which is simpler for console use
-#formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s')
-formatter = logging.Formatter("%(message)s")
-# tell the handler to use this format
-console.setFormatter(formatter)
-# add the handler to the root logger
-logging.getLogger('').addHandler(console)
-
-#infoformatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
-infoformatter = logging.Formatter("%(message)s")
-infofile = logging.FileHandler(LOG_FILENAME, 'w')
-infofile.setFormatter(infoformatter)
-infofile.setLevel(logging.INFO)
-logging.getLogger('').addHandler(infofile)
-
-#Read in systemconfig
-global systemconfig
-systemconfig = {}
-file_name = "/etc/systemconfig"
-try:
-    config_file = open(file_name)
-except:
-    logging.debug("%s could not be opened", file_name)
-    config_file = ''
-
-for line in config_file:
-    line = line.strip()
-    if line and line[0] is not "#" and line[-1] is not "=":
-        var, val = line.rsplit("=", 1)
-        val = val.strip('"')
-        systemconfig[var.strip()] = val.strip()
-
-
-if __name__ == "__main__":
-    config_file = "mv_config"
-    data_config = __import__(config_file,  globals(),  locals(),  [])
-    logging.debug("___________START OF DEBUG_________________________")
-    cmdoptions = main(sys.argv[1:])
-    logging.debug("______cmd line options______")
-    for i in cmdoptions.items():
-        logging.debug (i)
-    logging.debug("______systemconfig______")
-    for i in systemconfig.items():
-        logging.debug(i)
-    logging.debug("______hostoptions______")
-    for i in hostoptions.items():
-        logging.debug(i)
-    pass
-
diff --git a/abs/core-testing/LinHES-config-22/mv_ir.py b/abs/core-testing/LinHES-config-22/mv_ir.py
deleted file mode 100755
index bc1ae37..0000000
--- a/abs/core-testing/LinHES-config-22/mv_ir.py
+++ /dev/null
@@ -1,330 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging, mv_common
-import os, re , glob
-from time import time, localtime, strftime
-import time
-import pwd
-
-def setup_lirc_links(mythhome):
-    logging.debug("    Creating links for lirc")
-    try:
-        mythuid = pwd.getpwnam('mythtv')[2]
-        mythgid = pwd.getpwnam('mythtv')[3]
-    except:
-        logging.critical("*    mythuid not found")
-        mythuid = '1000'
-        mythgid = '1000'
-    if not os.path.exists(mythhome+"/.mythtv"):
-        logging.debug("    Creating %s/.mythtv",mythhome)
-        try:
-            os.mkdir(mythhome+"/.mythtv")
-        except:
-            logging.debug("   Couldn't create .mythtv ")
-            return
-        try:
-            os.chown(mythhome+"/.mythtv", mythuid, mythgid)
-            logging.debug("*    Couldn't chown of %s", mythhome)
-        except:
-            cmd = ''' chown -R mythtv %s/.mythtv''' %mythhome
-            mv_common.runcmd(cmd)
-            cmd = ''' chgrp -R mythtv %s/.mythtv''' %mythhome
-            mv_common.runcmd(cmd)
-            pass
-
-    if os.path.exists("/etc/lircrc"):
-        if not os.path.exists(mythhome+"/.mythtv/lircrc"):
-            logging.debug("    Creating symlink for myth lircrc")
-            os.symlink("/etc/lircrc",mythhome+"/.mythtv/lircrc")
-        else:
-            logging.debug("    %s/lircrc already present",mythhome)
-
-        if not os.path.exists(mythhome+"/.lircrc"):
-            logging.debug("    Creating symlink for lircrc")
-            os.symlink("/etc/lircrc",mythhome+"/.lircrc")
-        else:
-            logging.debug("    %s/.lircrc already present",mythhome)
-    else:
-        logging.debug("    /etc/lircrc does not exisit, can not link it")
-
-def scrub_modules(filename,module):
-    logging.debug("    scrubbing %s from %s",module,filename)
-    cmd = '''sed -i -e '/.*#%s/d' %s''' %(module,filename)
-    mv_common.runcmd(cmd)
-
-def add_module(filename,module):
-    logging.debug("    adding  %s to %s",module,filename)
-    cmd = ''' echo "%s" >> %s ''' %(module,filename)
-    mv_common.runcmd(cmd)
-
-def unload_all_lirc():
-    logging.debug("    Unloading all lirc modules")
-    cmd = "sv stop lircd"
-    mv_common.runcmd(cmd)
-    cmd = "killall -9 lircd"
-    mv_common.runcmd(cmd)
-    cmd = '''modprobe -r $(lsmod |grep ^lirc |awk '{print $1}') '''
-    mv_common.runcmd(cmd)
-
-
-
-def include_file( incfile,filename):
-    logging.debug("     including %s within %s",filename,incfile)
-    try:
-        f = open( incfile, 'a')
-    except:
-        logging.debug("    Couldn't open %s for writing",incfile)
-        return
-    line = '''include "%s" ''' %filename
-    logging.debug("   %s",line)
-    f.write(line)
-    f.write("\n")
-    f.close()
-
-def setup_ir_remote(Remotetype,templates):
-    logging.debug("    Setup of remote type %s",Remotetype)
-    if Remotetype == "no_remote":
-        mv_common.remove_service("lircd")
-    elif Remotetype == "tinker":
-        pass
-    else:
-        currenttime = strftime("%b-%d-%Y-%H:%M:%S", localtime())
-        cmd = "mv /etc/lircd.conf /etc/lircd.conf-%s" %currenttime
-        mv_common.runcmd(cmd)
-        cmd = "mv /etc/lircrc /etc/lircrc-%s" %currenttime
-        mv_common.runcmd(cmd)
-        files = templates + "/remotes/" + Remotetype + "/lircd*"
-        logging.debug("    Using %s",files)
-        for filename in glob.glob(files):
-            # Ignore subfolders
-            if os.path.isdir (filename):
-                logging.debug("    %s is a dir, skipping",filename)
-                continue
-            include_file("/etc/lircd.conf",filename)
-        files = templates + "/remotes/" + Remotetype + "/lircrc*"
-        logging.debug("    Using %s",files)
-        for filename in glob.glob(files):
-            # Ignore subfolders
-            if os.path.isdir (filename):
-                logging.debug("    %s is a dir, skipping",filename)
-                continue
-            include_file("/etc/lircrc",filename)
-        cmd =  "chmod 755 /etc/lircrc"
-        mv_common.runcmd(cmd)
-        mv_common.add_service("lircd")
-
-
-def setup_ir_receiver(ReceiverType,TEMPLATES):
-    logging.info("    Configuring receiver %s", ReceiverType)
-    if ReceiverType == "Serial":
-        scrub_modules("/etc/modules.mythvantage","lirc")
-        add_module("/etc/modules.mythvantage","lirc_serial    #lirc")
-        cmd = "load-modules-mythvantage.sh"
-        mv_common.runcmd(cmd)
-        mv_common.remove_service("igdaemon")
-        mv_common.remove_service("tatir")
-
-    elif ReceiverType == "Usb-imon":
-        scrub_modules("/etc/modules.mythvantage","lirc")
-        add_module("/etc/modules.mythvantage","lirc_imon    #lirc")
-        cmd = "load-modules-mythvantage.sh"
-        mv_common.runcmd(cmd)
-        mv_common.remove_service("igdaemon")
-        mv_common.remove_service("tatir")
-
-    elif ReceiverType == "Hauppauge":
-        scrub_modules("/etc/modules.mythvantage","lirc")
-        add_module("/etc/modules.mythvantage","lirc_i2c    #lirc")
-        mv_common.cp_and_log(TEMPLATES+"/modules/lirc_i2c.conf" ,
-                             "/etc/modprobe.d/lirc_i2c.conf")
-        cmd = "rmmod lirc_i2c"
-        mv_common.runcmd(cmd)
-        cmd = "load-modules-mythvantage.sh"
-        mv_common.runcmd(cmd)
-        mv_common.remove_service("igdaemon")
-        mv_common.remove_service("tatir")
-    elif ReceiverType == "pvr150":
-        scrub_modules("/etc/modules.mythvantage","lirc")
-        add_module("/etc/modules.mythvantage","lirc_i2c    #lirc")
-        mv_common.cp_and_log(TEMPLATES+"/modules/lirc_i2c.conf" ,
-                             "/etc/modprobe.d/lirc_i2c.conf")
-        cmd = "rmmod lirc_i2c"
-        mv_common.runcmd(cmd)
-        cmd = "load-modules-mythvantage.sh"
-        mv_common.runcmd(cmd)
-        mv_common.remove_service("igdaemon")
-        mv_common.remove_service("tatir")
-    elif ReceiverType == "iguanaIR-usb":
-        scrub_modules("/etc/modules.mythvantage","lirc")
-        mv_common.add_service("igdaemon")
-        mv_common.remove_service("tatir")
-
-    elif ReceiverType == "tatir":
-        scrub_modules("/etc/modules.mythvantage","lirc")
-        mv_common.add_service("tatir")
-        mv_common.remove_service("igdaemon")
-
-    else:
-        logging.debug("    didn't match receiver, using genric case")
-        scrub_modules("/etc/modules.mythvantage","lirc")
-        mv_common.remove_service("igdaemon")
-        mv_common.remove_service("tatir")
-
-def setup_blaster_proto(HostBlasterType,Hostnumblaster,TEMPLATES,systemconfig):
-    logging.debug("    Start of setup_blaster_proto")
-    logging.debug("    HostBlasterType: %s", HostBlasterType)
-    logging.debug("    Hostnumblaster: %s" , Hostnumblaster)
-    if not HostBlasterType == "pvr150" and not HostBlasterType == "None":
-        for i in range(int(Hostnumblaster)):
-            try:
-                proto = systemconfig["HostTransmitproto_"+str(i+1)]
-                logging.debug("    proto: %s",proto)
-            except:
-               logging.info("    unkown proto for %s",i+1)
-               continue
-            template=TEMPLATES+"/transmit/%s/lircd.conf" %proto
-            if os.path.exists(template):
-                logging.debug("    include blaster template: %s",proto)
-                include_file("/etc/lircd.conf",template)
-            else:
-                logging.debug("    template: %s is not present",template)
-    logging.info("------NEED TO SETUP CHANGE_CHANNEL------")
-
-
-def setup_blaster_transmiter(HostBlasterType):
-    logging.debug("    Start of setup_blaster_transmiter")
-    logging.info("    HostBlasterType : %s", HostBlasterType)
-
-    if  HostBlasterType == "Receiver":
-        logging.info("    Blaster is receiver, skipping module config for Blaster")
-        return
-
-    if HostBlasterType == "no blaster":
-        scrub_modules("/etc/modules.mythvantage","blaster")
-    elif HostBlasterType == "Serial":
-        scrub_modules("/etc/modules.mythvantage","blaster")
-        add_module("/etc/modules/.mythvantage","lirc_serial    #blaster")
-        cmd = "load-modules-mythvantage.sh"
-        mv_common.runcmd(cmd)
-    elif HostBlasterType == "pvr150":
-        scrub_modules("/etc/modules.mythvantage", "blaster")
-        scrub_modules("/etc/modules.mythvantage", "lirc")
-        add_module("/etc/modules.mythvantage", "lirc_pvr150    #blaster")
-        add_module("/etc/modules.mythvantage", "lirc_pvr150    #lirc")
-        cmd = "rmmod lirc_i2c"
-        mv_common.runcmd(cmd)
-        cmd = "load-modules-mythvantage.sh"
-        mv_common.runcmd(cmd)
-    else:
-        scrub_modules("/etc/modules.mythvantage","blaster")
-
-def setup_lcd(LCDtype, TEMPLATES, Remotetype):
-    logging.debug("____Start of setup_lcd____")
-    logging.debug("    LCDType: %s", LCDtype)
-    logging.debug("    Remotetype: %s", Remotetype)
-    if LCDtype == "tinker":
-        logging.info("   tinker mode detected")
-        return
-
-    if LCDtype == "no_lcd":
-        logging.info("    Disabling LCD support")
-        cmd = "sv stop lcdd"
-        mv_common.runcmd(cmd)
-        #sometimes it doesn't want to die
-        cmd = "killall -9 LCDd"
-        mv_common.runcmd(cmd)
-        cmd = "load-modules-mythvantage.sh  UNLOAD LCD"
-        mv_common.runcmd(cmd)
-        scrub_modules("/etc/modules.mythvantage", "LCD")
-        mv_common.remove_service("lcdd")
-    else:
-        lcdmodule="%s/LCD/%s/modules" %(TEMPLATES,LCDtype)
-        if os.path.exists(lcdmodule):
-            logging.debug("    Adding module for LCD")
-            scrub_modules("/etc/modules.mythvantage", "LCD")
-            cmd = "cat %s >> /etc/modules.mythvantage" %lcdmodule
-            mv_common.runcmd(cmd)
-        if Remotetype != "tinker":
-            lcdconf = "%s/LCD/%s/LCDd.conf" %(TEMPLATES,LCDtype)
-            lcdlirc = "%s/LCD/%s" %(TEMPLATES,LCDtype)
-            mv_common.pacinstall("lcdproc")
-            if os.path.exists(lcdconf):
-                logging.debug("    Copying in lcdconf template file: %s",lcdconf)
-                mv_common.cp_and_log(lcdconf, "/etc/LCDd.conf")
-            else:
-                logging.debug("    %s is not present, will not copy it")
-
-            if os.path.exists(lcdlirc+"/lircrc"):
-                logging.debug("    LCD seems to support lirc")
-                #setup the lirc aspect of the lcd
-                #copied from setup_ir_remote
-                files = lcdlirc+"/lircd*"
-                logging.debug("    Using %s",files)
-                for filename in glob.glob(files):
-                    # Ignore subfolders
-                    if os.path.isdir (filename):
-                        logging.debug("    %s is a dir, skipping",filename)
-                        continue
-                    include_file("/etc/lircd.conf",filename)
-                files = lcdlirc+"/lircrc*"
-                logging.debug("    Using %s",files)
-                for filename in glob.glob(files):
-                    # Ignore subfolders
-                    if os.path.isdir (filename):
-                        logging.debug("    %s is a dir, skipping",filename)
-                        continue
-                    include_file("/etc/lircrc",filename)
-                cmd =  "chmod 755 /etc/lircrc"
-                mv_common.runcmd(cmd)
-
-            mv_common.add_service("lcdd")
-            mv_common.restart_service("lcdd")
-    logging.debug("__End of setup_lcd")
-
-def setup_ir(systemconfig, data_config):
-    rc = False
-    logging.info("____Start of IR____")
-    if systemconfig["Remotetype"] == "tinker":
-        logging.info("    Tinker mode detected")
-    else:
-        if not systemconfig["HostBlasterType"]:
-            HostBlasterType = "unknown"
-            Hostnumblaster = "0"
-        else:
-            HostBlasterType = systemconfig["HostBlasterType"]
-            Hostnumblaster  = systemconfig["Hostnumblaster"]
-
-        if systemconfig["HostBlasterType"] == "pvr150":
-            remotetype = "hauppauge-blaster"
-            logging.debug("    pvr150 blaster selected, setting remote to hauppauge-blaster")
-        else:
-            remotetype = systemconfig["Remotetype"]
-
-        setup_ir_remote(remotetype,systemconfig["TEMPLATES"])
-        setup_lirc_links(data_config.MYTHHOME)
-
-        if systemconfig["ReceiverType"]:
-            setup_ir_receiver(systemconfig["ReceiverType"],
-                              systemconfig["TEMPLATES"])
-        else:
-            setup_ir_receiver("unknown", systemconfig["TEMPLATES"])
-        unload_all_lirc()
-        setup_blaster_proto(HostBlasterType,
-                            Hostnumblaster,
-                            systemconfig["TEMPLATES"],
-                            systemconfig)
-        setup_blaster_transmiter(HostBlasterType)
-        cmd = "load-modules-mythvantage.sh"
-        mv_common.runcmd(cmd)
-        time.sleep(2)
-        mv_common.udev_trigger()
-        cmd="sv start lircd"
-        mv_common.runcmd(cmd)
-        rc = [ True , True ]
-    if systemconfig["LCDtype"]:
-        setup_lcd(systemconfig["LCDtype"],
-                  systemconfig["TEMPLATES"],
-                  systemconfig["Remotetype"])
-    else:
-        logging.debug("    LCD not defined")
-    logging.info("__End IR\n")
-    return rc
\ No newline at end of file
diff --git a/abs/core-testing/LinHES-config-22/mv_misc.py b/abs/core-testing/LinHES-config-22/mv_misc.py
deleted file mode 100755
index 9ea9c95..0000000
--- a/abs/core-testing/LinHES-config-22/mv_misc.py
+++ /dev/null
@@ -1,180 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging, mv_common
-import os, re
-from urllib2 import Request, urlopen, URLError, HTTPError
-
-config_file = "mv_config"
-data_config = __import__(config_file, globals(), locals(), [])
-
-def setup_zip(MVROOT,zipcode):
-    logging.debug("____Setting up the zipcode____")
-
-    if zipcode:
-        cmd="%s/bin/restore_default_settings.sh -c ZIP -c %s" %(MVROOT,zipcode)
-        mv_common.runcmd(cmd)
-        #Let's also speed things up for those in North America
-        cmd="mkdir /usr/bin/perlbin/vendor/tv_grabbers_non_na"
-        mv_common.runcmd(cmd)
-        cmd="mv  /usr/bin/perlbin/vendor/tv_grab_*  /usr/bin/perlbin/vendor/tv_grabbers_non_na"
-        mv_common.runcmd(cmd)
-        cmd="mv  /usr/bin/perlbin/vendor/tv_grabbers_non_na/tv_grab_na*  /usr/bin/perlbin/vendor/"
-        mv_common.runcmd(cmd)
-    else:
-        logging.debug("    Zipcode is not set")
-
-    logging.debug("__End of zipcode\n")
-
-def setup_tz(timezone,TEMPLATES):
-    logging.info("____Setting up the timezone____")
-
-    if not timezone:
-        timezone="unknown"
-    logging.info("    Setting timezone to %s",timezone)
-    mv_common.remove_file("/etc/localtime")
-    #try:
-        #logging.debug("    Removing /etc/localtime")
-        #os.remove("/etc/localtime")
-    #except:
-        #logging.debug("    Couldn't remove /etc/localtime")
-        #pass
-
-    srclink="/usr/share/zoneinfo/%s" %timezone
-    logging.debug("    symlinking %s to /etc/localtime",srclink)
-    try:
-        os.symlink(srclink,"/etc/localtime")
-    except:
-        logging.critical("    Couldn't make symlink for /etc/localtime")
-    cmd = '''sed -e "s/^TIMEZONE=.*$/TIMEZONE=\\"%s\\" /" /etc/rc.conf > $TEMPLATES/rc.conf''' %re.escape(timezone)
-    mv_common.runcmd(cmd)
-
-    if os.path.exists("/etc/php/php.ini"):
-        logging.info("    Changing timezone for php")
-        cmd = '''sed -i "s/^.*date.timezone.*$/date.timezone=%s/" ${BASE}/etc/php/php.ini''' %re.escape(timezone)
-        mv_common.runcmd(cmd)
-
-    mv_common.cp_and_log(TEMPLATES+"/rc.conf","/etc/rc.conf")
-    logging.info("__End of timezone\n")
-
-def setup_nfs(systemconfig):
-    nfslist=[]
-    logging.info("____Start of setup_nfs____")
-    scrubnfs(systemconfig["TEMPLATES"])
-
-    if systemconfig["HaveCentralNFS"] == "yes":
-        logging.debug("    Using a Central NFS server")
-        if systemconfig["NFSserver"] == "file:nfsmap":
-        #if it's a file check for it, failure results in downloading attempt from MBE
-            nfsmap_file=data_config.MYTHHOME+"/templates/nfsmap"
-            if not os.path.exists(nfsmap_file):
-                logging.debug("    Couldn't find local %s",nfsmap_file)
-                logging.info("    Trying to download nfsmap from MBE")
-                nfsmap_file = download_nfsmap(systemconfig["dbhost"])
-            nfslist = process_nfsmap_file(nfsmap_file)
-        # if it's an ip  parse ip and download file
-        elif re.search(systemconfig["NFSserver"],":nfsmap"):
-            ip=systemconfig["NFSserver"].split(":")[0]
-            nfsmap_file = download_nfsmap(ip)
-            nfslist = process_nfsmap_file(nfsmap_file)
-        #else treat it as a single mount point
-        else:
-            item = (systemconfig["NFSserver"] , systemconfig["NFSmount"])
-            nfslist.append(item)
-    else:
-        #if standalone or slave try to use MBE
-        if systemconfig["SystemType"] == "Frontend_only" or systemconfig["SystemType"] == "Slave_Backend":
-            item = (systemconfig["dbhost"] , data_config.DATAMOUNT)
-            nfslist.append(item)
-    setup_nfs_fstab(nfslist)
-    logging.info("__End of nfs\n")
-
-def setup_sleep(systemconfig):
-    logging.debug("____Setting up sleep____")
-    autoshutdown = systemconfig["AutoShutdown"]
-    stime1 = systemconfig["Shutdowntime"]
-    stime2 = systemconfig["Shutdowntime2"]
-    cstime1=''
-
-    if autoshutdown == "1" :
-        if  not stime1 == "-1" :
-            cstime1 = stime1
-            cshutdown = cstime1
-        if  not stime2 == "-1" :
-            if cstime1 :
-                cshutdown = "%s,%s" %(cstime1,stime2)
-            else:
-                cshutdown = stime2
-        logging.debug("    Shutdown time at %s",cshutdown)
-        cmd='''sed -e "s/HOUR/%s/g" %s/cron.template | crontab - -u mythtv''' %(cshutdown,systemconfig["TEMPLATES"])
-        mv_common.runcmd(cmd)
-    else:
-        logging.info("    Shutdown not enabled")
-        cmd='''sed -e "/00 HOUR.*/d" %s/cron.template | crontab - -u mythtv''' %systemconfig["TEMPLATES"]
-        mv_common.runcmd(cmd)
-
-    logging.debug("__End of  sleep\n")
-
-
-def process_nfsmap_file(mapfile):
-    logging.debug("   processing nfsmap file %s",mapfile)
-    nfslist = []
-    try:
-        f = open(mapfile,"r")
-        for line in f.readlines():
-            if line.startswith("#"):
-                continue
-            item = line.split()
-            if len(item) <= 1 :
-                continue
-            logging.debug("    %s",item)
-            nfslist.append(item)
-    except :
-        logging.critical("Couldn't read file %s, or some other error",mapfile)
-    return nfslist
-
-def scrubnfs(templates):
-    logging.info("    Scrubbing nfs")
-    mv_common.cp_and_log("/etc/fstab",templates+"/fstab.conf.template")
-    #used this sed cmd because it's clean and took me forever to figure out =)
-    cmd='''sed '/^#STARTSCRUB.*$/,/^#ENDSCRUB.*$/d' %s/fstab.conf.template > /etc/fstab''' %templates
-    mv_common.runcmd(cmd)
-
-def download_nfsmap(ip):
-    nfsmap_file="/tmp/nfsmap"
-    myurl="http://%s:1337/templates/nfsmap" %ip
-    req = Request(myurl)
-    try:
-        f = urlopen(req)
-        logging.info("    downloading %s", myurl)
-        local_file = open(nfsmap_file, "w")
-        #Write to our local file
-        local_file.write(f.read())
-        local_file.close()
-    #handle errors
-    except HTTPError, e:
-        logging.info("    File download failed")
-        logging.debug("    %s", myurl)
-        logging.debug("   HTTP Error: %s", e.code)
-    except URLError, e:
-        logging.info("    File download failed")
-        logging.debug("   %s",myurl)
-        logging.debug("   URL Error: %s ", e.reason)
-
-    return nfsmap_file
-
-def setup_nfs_fstab(nfslist):
-    logging.info("    Adding nfs paths to fstab")
-    try:
-        f = open('/etc/fstab', 'a')
-        line = "#STARTSCRUB --------------anything in this block will be scrubbed\n"
-        f.write(line)
-        for s, m in nfslist:
-            line = "%s %s    nfs \n" %(s,m)
-            logging.debug("    %s",line)
-            f.write(line)
-        line = "#ENDSCRUB\n"
-        f.write(line)
-        f.close()
-    except:
-        logging.critical("    *Couldn't open /etc/fstab for writing")
-    logging.debug("   Done adding nfs paths to fstab")
-
diff --git a/abs/core-testing/LinHES-config-22/mv_network.py b/abs/core-testing/LinHES-config-22/mv_network.py
deleted file mode 100755
index b80e4cc..0000000
--- a/abs/core-testing/LinHES-config-22/mv_network.py
+++ /dev/null
@@ -1,507 +0,0 @@
-# -*- coding: utf-8 -*-
-import sys , os, commands , glob, time, re
-import logging
-import mv_common
-import socket, fcntl, struct, array
-import netifaces, iplib
-global etcnetdir
-etcnetdir = "/etc/net/ifaces"
-
-def setup_MYTH_DHCP(systemconfig):
-    default_interface = systemconfig["default_interface"]
-    try:
-        defaultdhcp = systemconfig["HostUSEDHCP"+default_interface]
-    except:
-        logging.critical("    *Error occured finding default dhcp")
-        defaultdhcp = "0"
-    logging.debug("    Using %s as dhcp value for %s",  defaultdhcp, default_interface)
-    return defaultdhcp
-
-def all_interfaces():
-    max_possible = 128  # arbitrary. raise if needed.
-    bytes = max_possible * 32
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    names = array.array('B', '\0' * bytes)
-    outbytes = struct.unpack('iL', fcntl.ioctl(
-        s.fileno(),
-        0x8912,  # SIOCGIFCONF
-        struct.pack('iL', bytes, names.buffer_info()[0])
-    ))[0]
-    namestr = names.tostring()
-    return [namestr[i:i+32].split('\0', 1)[0] for i in range(0, outbytes, 32)]
-
-def get_ip(ifname):
-    logging.debug("    Finding ip address for %s", ifname)
-    all_if = all_interfaces()
-    logging.debug("    found interfaces:%s", all_if)
-    if ifname in all_if :
-        logging.debug("    Found %s in all_interfaces", ifname)
-    else:
-        logging.critical("*     Couldn't find %s in list", ifname)
-        ifname = all_if[0]
-        logging.critical("*     Using %s for interface name", ifname)
-
-
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    return socket.inet_ntoa(fcntl.ioctl(
-        s.fileno(),
-        0x8915,  # SIOCGIFADDR
-        struct.pack('256s', ifname[:15])
-    )[20:24])
-
-def get_default_route(iface):
-    rcroute = "127.0.0.1" 
-    f = open ('/proc/net/route', 'r')
-    for line in f:
-        words = string.split (line)
-        netiface = words[0]
-        route =  words[2]
-        flags =  words[3]
-        try:
-            if ( netiface == iface ) and ( flags == "0003") :
-                route = iplib.IPv4Address(route, notation="hex")
-                t = str(route.get_dot())
-                s = t.split(".")
-                rcroute = s[3] + "." + s[2] + "." + s[1] + "." + s[0]
-                break
-        except ValueError:
-            pass
-    return rcroute
-
-def setup_MYTH_IP(systemconfig):
-    default_interface = systemconfig["default_interface"]
-    #check for dhcp in use
-    if setup_MYTH_DHCP(systemconfig) == "0":
-        logging.debug("   dhcp is in use, finding dhcp ip")
-        defaultip = get_ip(default_interface)
-    else:
-        try:
-            defaultip = systemconfig["Hostip"+default_interface]
-        except:
-            logging.debug("    Error occured finding the defaultip")
-            defaultip = "127.0.0.1"
-    logging.debug("    Using %s as default ip", defaultip)
-    return defaultip
-
-
-def setup_MYTH_GW(systemconfig):
-    default_interface = systemconfig["default_interface"]
-    #check for dhcp in use
-    if setup_MYTH_DHCP(systemconfig) == "0":
-        logging.debug("   dhcp is in use, finding dhcp ip")
-        defaultgw = get_default_route(default_interface)
-    else:
-        try:
-            defaultgw = systemconfig["Hostgw"+default_interface]
-        except:
-            logging.debug("    Error occured finding the defaultgw")
-            defaultgw = "127.0.0.1"
-    logging.debug("    Using %s as default gw", defaultgw)
-    return defaultgw
-
-
-def setup_MTYH_DNS():
-    returndns = "127.0.0.1"
-    try:
-      f = open ('/etc/resolv.conf', 'r')
-      for line in f:
-          if line.startswith("nameserver"):
-              print line
-              returndns = line.split()[1]  
-              break
-    except:
-      logging.debug("   Couldn't open /etc/resolv.conf for myth_dns")
-    logging.debug("   using %s for myth_dns", returndns)
-    return returndns
-
-
-
-
-
-def flush(netdev):
-    logging.debug("    Flushing %s",netdev)
-    cmd = '''ip address flush dev %s''' %netdev
-    mv_common.runcmd(cmd)
-
-def kill_dhcp(basedir):
-    logging.debug("    _Start of kill_dhcp")
-    logging.debug("    Killing off dhcpd")
-    stddir = os.getcwd()
-    piddir = ("%s/var/run/") %basedir
-    try:
-        os.chdir(piddir)
-        for FILE in glob.glob("dhcpcd-*.pid"):
-            f = open(FILE,'r')
-            pid = f.readline()
-            f.close
-            cmd = "kill -9 %s" %pid
-            mv_common.runcmd(cmd)
-            mv_common.remove_file(FILE)
-        os.chdir(stddir)
-    except:
-        pass
-
-def setup_nameserver(dns):
-    logging.info("    Adding %s for DNS", dns)
-    cmd = '''grep -q %s /etc/resolv.conf''' %dns
-    status = mv_common.runcmd(cmd)
-    if  not status == 0 :
-        cmd =  ''' echo "nameserver %s" >> /etc/resolv.conf ''' %dns
-        mv_common.runcmd(cmd)
-
-
-
-def setup_hostname(systemconfig):
-    logging.debug("   _Start of setup_hostname")
-    try:
-        hostname = systemconfig["hostname"]
-    except:
-        logging.critical("    *Hostname could not be set")
-        logging.info("    Using default value of me")
-        hostname = "me"
-    logging.info("    Setting the hostname to %s", hostname)
-    cmd = ''' echo %s > /etc/hostname ''' %hostname
-    mv_common.runcmd(cmd)
-    cmd = "cat /etc/hosts | grep -v 127.0.0.1 | grep -v %s > /tmp/hosts" %hostname
-    mv_common.runcmd(cmd)
-    if systemconfig["mythdhcp"] == "1" :
-        logging.debug("    not using dhcp")
-        cmd = ''' echo 127.0.0.1 localhost  > /etc/hosts '''
-        mv_common.runcmd(cmd)
-        cmd = ''' echo %s %s  > /etc/hosts ''' %(systemconfig["mythip"], systemconfig["hostname"])
-        mv_common.runcmd(cmd)
-    else:
-        cmd = ''' echo 127.0.0.1 %s localhost  > /etc/hosts ''' %systemconfig["hostname"]
-        mv_common.runcmd(cmd)
-    cmd = '''cat /tmp/hosts >> /etc/hosts '''
-    mv_common.runcmd(cmd)
-
-
-def write_wpafile(line,netdev):
-    logging.debug("    writing out wpa_supplicant.conf file")
-    logging.debug(line)
-    wpafile = etcnetdir+"/"+netdev+"/wpa_supplicant.conf"
-    try:
-        f = open(wpafile,'w')
-        f.write(line)
-        f.close()
-    except:
-        logging.debug("    Couldn't write to %s",wpafile)
-
-def setup_wpa(netinfo,netdev):
-    logging.info("    %s will use wpa for encryption",netdev)
-    line = '''
-#This file was automaticly generated, any changes may be lost
-ctrl_interface=/var/run/wpa_supplicant
-network={
-    ssid="%s"
-    # Preshared key as an ASCII passphrase
-    psk="%s"
-    scan_ssid=1
-    key_mgmt=WPA-EAP WPA-PSK NONE
-    pairwise=CCMP TKIP
-    proto=WPA RSN
-}''' %(netinfo["ESSID"],netinfo["KEY"])
-    write_wpafile(line,netdev)
-
-def setup_wep(netinfo,netdev):
-    logging.info("    %s will use wep for encryption",netdev)
-    logging.debug("    When a packet comes along, you must wep it")
-    line='''
-#This file was automaticly generated, any changes may be lost
-ctrl_interface=/var/run/wpa_supplicant
-network={
-        ssid="%s"
-        key_mgmt=NONE
-        wep_key0=%s
-        wep_tx_keyidx=0
-        scan_ssid=1
-        auth_alg=SHARED
-}
-''' %(netinfo["ESSID"],netinfo["KEY"])
-    write_wpafile(line,netdev)
-
-
-def setup_none(netinfo,netdev):
-    logging.info("    %s will not use encryption",netdev)
-    line = '''
-#This file was automaticly generated, any changes may be lost
-ctrl_interface=/var/run/wpa_supplicant
-network={
-        ssid="%s"
-        key_mgmt=NONE
-}
-''' %netinfo["ESSID"]
-    write_wpafile(line,netdev)
-
-def setup_interface(netdev,systemconfig):
-    logging.debug("    _Start of setup_interface for %s",netdev)
-    nettrans = {'Hostip':'ip',
-                'Hostnetmask':'netmask',
-                'HostActive':'isactive',
-                'HostDNS':'dns',
-                'HostUSEDHCP':'UseDHCP',
-                'HostGW':'GW',
-                'HostMTU':'mtu',
-                'HOST_iswireless':"wireless",
-                'HostESSID':'ESSID',
-                'HostKey':'KEY',
-                'HostUseEncryption':'ENCRYPT'}
-    netinfo = {}
-    #populate the netinfo dict
-    for netitem in nettrans:
-        if systemconfig[netitem+netdev]:
-            netinfo[nettrans[netitem]] = systemconfig[netitem+netdev]
-        else:
-            netinfo[nettrans[netitem]] = False
-        logging.debug("     %s:%s",netitem,netinfo[nettrans[netitem]])
-    logging.info("    %s wireless: %s", netdev,netinfo["wireless"])
-    try:
-        os.makedirs(etcnetdir)
-    except:
-        logging.debug("   Could not create %s",etcnetdir)
-
-    optionfile=etcnetdir+"/"+netdev+"/options"
-    if not os.path.exists(optionfile):
-	try:
-            os.makedirs(etcnetdir+"/"+netdev)
-	except:
-            pass
-        mv_common.cp_and_log(systemconfig["TEMPLATES"]+"/etcnet/eth/options", optionfile)
-
-    if netinfo["isactive"] == "1" :
-        change_iface_state(netdev,"enabled")
-    else:
-        change_iface_state(netdev,"disabled")
-
-    if netinfo["wireless"] == "1" :
-
-        logging.info("    Enabling wireless extensions")
-        cmd = ''' sed -i -e 's/^CONFIG_WIRELESS=.*$/CONFIG_WIRLESS=yes/g'  %s/%s/options''' %(etcnetdir,netdev)
-        mv_common.runcmd(cmd)
-        if netinfo["ENCRYPT"] == "WEP":
-            setup_wep(netinfo,netdev)
-        elif netinfo["ENCRYPT"] == "WPA":
-            setup_wpa(netinfo,netdev)
-        elif netinfo["ENCRYPT"] == "none":
-            setup_none(netinfo,netdev)
-
-    else:
-        logging.info("    Disabling wireless extensions")
-        cmd = '''sed -i -e 's/^CONFIG_WIRLESS=.*$/CONFIG_WIRLESS=no/g' %s/%s/options''' %(etcnetdir, netdev)
-        mv_common.runcmd(cmd)
-        #try:
-        wpafile=etcnetdir+"/"+netdev+"/wpa_supplicant.conf"
-            #os.remove(wpafile)
-        mv_common.remove_file(wpafile)
-        #except:
-            #logging.debug("    Couldn't remove %s",wpafile)
-
-    if netinfo["UseDHCP"] == "0" :
-        logging.info("    Enabling DHCP support")
-        cmd = ''' sed -i -e 's/^BOOTPROTO=.*$/BOOTPROTO=dhcp/g' %s/%s/options''' %(etcnetdir, netdev)
-        mv_common.runcmd(cmd)
-    else:
-        logging.info("    Using static ip address of %s",netinfo["ip"])
-        cmd = ''' sed -i -e 's/^BOOTPROTO=.*$/BOOTPROTO=static/g' %s/%s/options''' %(etcnetdir, netdev)
-        mv_common.runcmd(cmd)
-        cmd = '''echo "default via %s" > %s/%s/ipv4route''' %(netinfo["GW"], etcnetdir, netdev)
-        mv_common.runcmd(cmd)
-        cmd = '''echo "%s%s" > %s/%s/ipv4address ''' %(netinfo["ip"], netinfo["netmask"].split()[0], etcnetdir, netdev)
-        mv_common.runcmd(cmd)
-        setup_nameserver(netinfo["dns"])
-
-    if netinfo["mtu"] :
-        logging.info("    Setting mtu to %s", netinfo["mtu"])
-        cmd = '''sed -i '/^mtu.*$/d' %s/%s/iplink''' %(etcnetdir,netdev)
-        mv_common.runcmd(cmd)
-        cmd = ''' echo "mtu %s" >> %s/%s/iplink''' %(netinfo["mtu"], etcnetdir,netdev)
-        mv_common.runcmd(cmd)
-    else:
-        logging.info("    Using default mtu value")
-        cmd = '''sed -i '/^mtu.*$/d' %s/%s/iplink''' %(etcnetdir,netdev)
-        mv_common.runcmd(cmd)
-
-
-def change_iface_state(netdev, state):
-    if state == "enabled":
-        logging.info("    Activating %s", netdev)
-        cmd = '''sed -i -e 's/^ONBOOT=.*$/ONBOOT=yes/g' %s/%s/options''' %(etcnetdir,netdev)
-        mv_common.runcmd(cmd)
-        cmd = '''sed -i -e 's/^DISABLED=.*$/DISABLED=no/g' %s/%s/options ''' %(etcnetdir,netdev)
-        mv_common.runcmd(cmd)
-    else:
-        logging.info("    Disabling %s", netdev)
-        cmd = '''sed -i -e 's/^ONBOOT=.*$/ONBOOT=no/g' %s/%s/options''' %(etcnetdir,netdev)
-        mv_common.runcmd(cmd)
-        cmd = '''sed -i -e 's/^DISABLED=.*$/DISABLED=yes/g' %s/%s/options ''' %(etcnetdir,netdev)
-        mv_common.runcmd(cmd)
-        cmd = "/sbin/ifconfig %s down" %netdev
-        mv_common.runcmd(cmd)
-        cmd = "ip address flush %s" %netdev
-        mv_common.runcmd(cmd)
-
-def devcheck(netdev):
-    cmd = ''' /sbin/ifconfig %s''' %netdev
-    rc = mv_common.runcmd(cmd)
-    if rc == 0 :
-        return True
-    else:
-        return False
-
-def udev_rules(netdev):
-    filename = "/etc/udev/rules.d/net.rules"
-    if devcheck(netdev):
-        logging.info("    Finding macaddress for %s",netdev)
-        try:
-            macaddress = netifaces.ifaddresses(netdev)[netifaces.AF_LINK][0]['addr']
-            logging.debug("    Macaddress: %s",macaddress)
-        except:
-            logging.debug("    Couldn't find mac address for %s",netdev)
-            return
-        try:
-            f = open(filename,'a')
-        except:
-            logging.debug("    Couldn't open %s for writing", filename)
-            return
-        if netdev.startswith('eth'):
-            line = '''KERNEL=="eth*", SYSFS{address}=="%s", NAME="%s"''' % ( macaddress , netdev)
-        elif netdev.startswith('wlan'):
-            line = '''KERNEL=="wlan*", SYSFS{address}=="%s", NAME="%s"'''% ( macaddress , netdev)
-        elif netdev.startswith('ath'):
-            line = '''KERNEL=="ath*", SYSFS{address}=="%s", NAME="%s"''' % ( macaddress , netdev)
-        logging.debug("     adding to net.rules ")
-        logging.debug("    %s",line)
-        f.write(line)
-        f.write("\n")
-        f.close()
-
-def find_active(systemconfig,this_is_install):
-    interfacelist=('eth0', 'eth1', 'wlan0', 'wlan1', 'ath0')
-    logging.debug("    _Start of find_active")
-
-    if systemconfig["mythdhcp"] == "1":
-        mv_common.remove_file("/etc/resolv.conf")
-        cmd = ''' echo search lan > /etc/resolv.conf '''
-        mv_common.runcmd(cmd)
-        cmd = ''' echo nameserver 127.0.0.1 >> /etc/resolv.conf '''
-        mv_common.runcmd(cmd)
-
-    for netdev in interfacelist:
-        if this_is_install:
-            udev_rules(netdev)
-        currentnet = "HostActive" + netdev
-        try:
-            systemconfig[currentnet]
-        except:
-            logging.debug("    %s is not defined",currentnet)
-            change_iface_state(netdev, "disabled")
-            continue
-        if systemconfig[currentnet] == "1" :
-            #check if device is present
-            if devcheck(netdev) :
-                setup_interface(netdev,systemconfig)
-            else:
-                logging.debug("    Interface %s not found in config", netdev)
-                #change_iface_state(netdev, "disabled")
-        else:
-            change_iface_state(netdev, "disabled")
-
-def vnc_netboot_check():
-    logging.debug("    Start of VNC/NETBOOT check")
-    vnc = False
-    netboot = False
-    try:
-        f = open('/proc/cmdline', 'r')
-        bootoptions = f.readlines()
-        f.close()
-    except:
-        logging.critical("    *Couldn't open /proc/cmdline")
-        logging.debug("    Assuming it's ok to fiddle with the network")
-        return True
-    bootoptions =  bootoptions[0]
-    if re.match("vnc",bootoptions) != None :
-        logging.debug("    Found VNC option")
-        vnc = True
-    if re.match("nfsroot",bootoptions) != None :
-        logging.debug("    Found netboot option")
-        netboot = True
-
-    return (vnc or netboot)
-
-def start_network():
-    if not vnc_netboot_check():
-        logging.info("    Restarting network")
-        cmd ="/etc/net/scripts/network.init reload"
-        mv_common.runcmd(cmd)
-        cmd ="/etc/net/scripts/network.init restart"
-        mv_common.runcmd(cmd)
-    else:
-        logging.info("    Will not restart network due to netboot/vnc")
-
-
-def stop_network():
-    if not vnc_netboot_check():
-        logging.info("    Stopping network")
-        cmd ="/etc/net/scripts/network.init stop"
-        mv_common.runcmd(cmd)
-        kill_dhcp("")
-        interfacelist=('eth0', 'eth1', 'wlan0', 'wlan1', 'ath0')
-        for i in interfacelist:
-            flush(i)
-    else:
-        logging.info("    Will not stop network due to netboot/vnc")
-    pass
-
-def hostname_change_check(systemconfig):
-    restartfe = False
-    logging.debug("    _Start of hostname_change_check")
-    oldhostname = socket.gethostname()
-    #oldhostname = "crap"
-    newhostname = systemconfig["hostname"]
-    mv_root = systemconfig["MVROOT"]
-    logging.debug("    Old hostname: %s", oldhostname)
-    logging.debug("    New hostname: %s", newhostname)
-    if oldhostname != newhostname :
-        logging.info("    Changing hostname in database to match new hostname")
-        cmd ="%s/bin/restore_default_settings.sh -cuhostname -o -h%s" %(mv_root, oldhostname)
-        mv_common.runcmd(cmd)
-        logging.info("    Changing hostname to %s", newhostname)
-        cmd = "hostname %s" %newhostname
-        mv_common.runcmd(cmd)
-        if systemconfig["SystemType"] != "Frontend_only" :
-            logging.info("    Restarting backend")
-            mv_common.stop_service("mythbackend")
-            mv_common.start_service("mythbackend")
-            restartfe = True
-    else:
-        logging.debug("    old and new hostnames matched, leaving things along")
-    logging.debug("  __End of hostname_change_check")
-    return restartfe
-
-
-
-def setup_network (systemconfig,this_is_install):
-    logging.info("____Start of network____")
-    logging.info("    Setting up the network")
-    restartfe = hostname_change_check(systemconfig)
-    setup_hostname(systemconfig)
-    find_active(systemconfig,this_is_install)
-    start_network()
-    logging.info("__End of network\n")
-    return restartfe
-
-
-
-##this is used by the install process to start the network
-def install_network_setup(systemconfig):
-    logging.info("____Start of network_install____")
-    logging.info("    Setting up the network")
-    #setup_MYTH_vars
-    setup_hostname(systemconfig)
-    stop_network()
-    find_active(systemconfig)
-    start_network()
-    logging.info("__End of network install \n")
-
-
diff --git a/abs/core-testing/LinHES-config-22/mv_screensaver.py b/abs/core-testing/LinHES-config-22/mv_screensaver.py
deleted file mode 100755
index 2da970c..0000000
--- a/abs/core-testing/LinHES-config-22/mv_screensaver.py
+++ /dev/null
@@ -1,199 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging, mv_common
-import re
-import os
-
-
-def mplayer_saver_check (cmd,templatefile):
-    logging.debug("    Checking for heartbeat command in mplayer.conf")
-    mplayerconf = "/etc/mplayer/mplayer.conf"
-    if not os.path.exists(mplayerconf):
-        logging.debug("    copying in mplayer template file")
-        mv_common.cp_and_log(templatefile, mplayerconf)
-
-    try:
-        f = open(mplayerconf, 'r')
-        mplayerconf_contents = f.readlines()
-        f.close()
-    except:
-        logging.debug("    Couldn't open %s for reading",mplayerconf)
-        mplayerconf_contents = "#\n"
-
-    try:
-        f = open(mplayerconf, 'w')
-    except:
-        logging.debug("    Couldn't open %s for writing",mplayerconf)
-        return
-
-    for line in mplayerconf_contents:
-        if re.match("^.*stop-xscreensaver",line):
-            continue
-        elif re.match("^.*heartbeat-cmd",line):
-            continue
-        else:
-            f.write(line)
-
-    f.write("stop-xscreensaver = 0\n")
-    line='''heartbeat-cmd="%s"\n''' %cmd
-    f.write(line)
-    f.close()
-
-
-def killxscreensaver():
-    logging.info("   Stopping xscreensaver")
-    cmd="xscreensaver-command --exit "
-    mv_common.runcmd(cmd)
-    cmd="killall xscreensaver "
-    mv_common.runcmd(cmd)
-
-def killgscreensaver():
-    logging.info("    Stopping gnome-screensaver")
-    cmd="gnome-screensaver-command --exit "
-    mv_common.runcmd(cmd)
-    cmd="killall gnome-screensaver "
-    mv_common.runcmd(cmd)
-
-
-def setup_x_screensaver(idle,theme,screenconfigfile,templatefile):
-    logging.info("    Configuring X screensaver")
-    killgscreensaver()
-    logging.debug("    Why can't xscreensaver have a nice configuration !")
-
-    if not os.path.exists(screenconfigfile):
-        logging.debug("   copying in new template file")
-        mv_common.cp_and_log(templatefile,screenconfigfile)
-
-    try:
-        f = open(screenconfigfile, 'r')
-        screenconfigcontents=f.readlines()
-        f.close()
-    except:
-        logging.info("Couldn't open %s for reading",screenconfigfile)
-        return
-    try:
-        f = open(screenconfigfile, 'w')
-    except:
-        logging.info("Couldn't open %s for writing",screenconfigfile)
-        return
-
-    startline=0
-    foundline=0
-
-    for k, line in enumerate(screenconfigcontents):
-        if re.match("programs:",line):
-            startline = k
-        if re.search(theme,line):
-            foundline = k
-    themenumber=foundline-startline-2
-
-    for line in screenconfigcontents:
-        if re.match("selected.*$",line):
-            continue
-
-        if re.match("timeout",line):
-            logging.info("    Setting idletime to %s",idle)
-            outline = "timeout:   0:%s:00 \n" %idle
-            f.write(outline)
-        elif re.match("mode",line):
-            if theme == "Random":
-                logging.info("    Setting theme to %s", "Random")
-                outline = "mode:    random \n"
-                f.write(outline)
-                outline = "selected:    -1 \n"
-                f.write(outline)
-                continue
-
-            elif theme == "Blank":
-                logging.info("    Setting theme to %s", "blank")
-                outline = "mode:    blank \n"
-                f.write(outline)
-                outline = "selected:    -1 \n"
-                f.write(outline)
-                continue
-
-            else:
-                logging.info("    Setting theme to %s", theme)
-                outline = "mode:    one\n"
-                f.write(outline)
-                logging.debug("    Theme number is %s",themenumber)
-                outline = "selected:    %s\n" %themenumber
-                f.write(outline)
-                continue
-
-        else:
-            outline = line
-            f.write(outline)
-    f.close()
-    logging.debug("__End of xscreensaver")
-
-def setup_gnome_screensaver(theme,idletime):
-    logging.info("    Configuring gnome screensaver")
-
-    logging.info("    Disabling lock screen")
-    cmd='''gconftool-2 --direct   --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory  --type bool   --set /apps/gnome-screensaver/lock_enabled false'''
-    mv_common.runcmd(cmd)
-
-    logging.info("    Setting idletime to %s",idletime)
-    cmd='''gconftool-2 --direct  --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory  --type int -s "/apps/gnome-screensaver/idle_delay" %s''' %idletime
-    mv_common.runcmd(cmd)
-
-    logging.info("    Setting mode to single")
-    cmd='''gconftool-2 --direct  --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory  --type string -s "/apps/gnome-screensaver/mode" single'''
-    mv_common.runcmd(cmd)
-
-    if theme == "Random":
-        logging.info("    setting theme to random")
-        cmd='''gconftool-2 --direct  --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory  --type string -s "/apps/gnome-screensaver/mode" random'''
-        mv_common.runcmd(cmd)
-
-    elif theme == "Blank":
-        logging.info("    setting theme to blank")
-        cmd='''gconftool-2 --direct  --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory  --type string -s "/apps/gnome-screensaver/themes" blank'''
-        mv_common.runcmd(cmd)
-
-    else:
-        logging.info("    setting theme to %s",theme)
-        cmd='''gconftool-2  --direct  --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory --set --type list --list-type=string /apps/gnome-screensaver/themes [screensavers-%s]''' %theme
-        mv_common.runcmd(cmd)
-
-    killxscreensaver()
-    logging.info("__End gnome screensaver")
-
-
-
-
-def setup_screensaver (systemconfig,data_config):
-    logging.info("____Start of screensaver configuration____")
-    screensavertype = systemconfig["Screensavertype"]
-    theme = systemconfig["Screensavertheme"]
-    idletime = systemconfig["Screensaveridle"]
-    configfile = data_config.MYTHHOME+"/.xscreensaver"
-    templatefile = systemconfig["TEMPLATES"]+"/xscreensaver.template"
-    mtemplate = systemconfig["TEMPLATES"]+"/mplayer.conf.template"
-
-    if screensavertype == "xscreensaver":
-        mv_common.pacinstall("xscreensaver")
-        mv_common.pacremove("gnome-screensaver")
-        setup_x_screensaver(idletime, theme, configfile, templatefile)
-        mplayer_saver_check("/usr/bin/xscreensaver-command -deactivate &",mtemplate)
-
-    elif screensavertype == "gscreensaver":
-        mv_common.pacinstall("xscreensaver")
-        mv_common.pacinstall("gnome-screensaver")
-        setup_gnome_screensaver(theme,idletime)
-        mplayer_saver_check("/usr/bin/gnome-screensaver-command -p &",mtemplate)
-
-    elif screensavertype == "none":
-        mv_common.pacremove("xscreensaver")
-        mv_common.pacremove("gnome-screensaver")
-        killgscreensaver()
-        killxscreensaver()
-
-    elif screensavertype == "tinker" :
-        logging.debug("    screensaver tinker mode detected")
-    else:
-        logging.debug("   Unknown screensaver")
-    logging.info("__End of screensaver\n")
-
-
-
diff --git a/abs/core-testing/LinHES-config-22/mv_smolt.py b/abs/core-testing/LinHES-config-22/mv_smolt.py
deleted file mode 100755
index 5fd3722..0000000
--- a/abs/core-testing/LinHES-config-22/mv_smolt.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging
-import mv_common
-
-def read_release(stype):
-    if stype == "LinHES":
-        rfile = "/etc/LinHES-release"
-    else:
-        rfile = "/etc/MythVantage-release"
-
-    try:
-        f= open(rfile,'r')
-        releasename = f.readlines()[0]
-        f.close()
-    except:
-        logging.debug("    Couldn't open %s",rfile)
-        releasename = "unknown"
-
-    return releasename
-
-
-def setup_smolt_type(SystemType,Remotetype,RunFrontend,mythhome,stype):
-    logging.debug("____Start of setup_smolt_type____")
-    releasename = read_release(stype)
-
-    if SystemType == "Standalone":
-        smoltsystem = 6
-        MVRELEASE="%s (Standalone)" %releasename
-    elif SystemType == "Master_backend":
-        if RunFrontend == "1":
-            smoltsystem = 2
-            MVRELEASE="%s (MBE with Frontend)" %releasename
-        else:
-            smoltsystem=1
-            MVRELEASE="%s (MBE)" %releasename
-    elif SystemType == "Slave_backend":
-        if RunFrontend == "1" :
-            smoltsystem = 4
-            MVRELEASE="%s (SLAVE  with Frontend)" %releasename
-        else:
-            smoltsystem = 5
-            MVRELEASE="%s (SLAVE)" %releasename
-    elif SystemType == "Frontend_only":
-        smoltsystem = 3
-        MVRELEASE="%s ( Frontend only)" %releasename
-
-    logging.debug("    smolt type is %s : %s", MVRELEASE,smoltsystem)
-    smoltfile = mythhome+"/.mythtv/smolt.info"
-    cmd = ''' echo  "%s" > /etc/os_myth_release ''' %MVRELEASE
-    mv_common.runcmd(cmd)
-
-    cmd = '''echo "systemtype=%s" > %s''' %(smoltsystem,smoltfile)
-    mv_common.runcmd(cmd)
-
-    cmd = '''echo "remote=%s" >> %s ''' %(Remotetype,smoltfile)
-    mv_common.runcmd(cmd)
-
-    logging.debug("__End of setup_smolt_type")
-
diff --git a/abs/core-testing/LinHES-config-22/mv_software.py b/abs/core-testing/LinHES-config-22/mv_software.py
deleted file mode 100755
index aabcf89..0000000
--- a/abs/core-testing/LinHES-config-22/mv_software.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging, mv_common
-import os, re
-
-def setup_software(systemconfig, data_config):
-    logging.info("____Start of Software install____")
-    postfix=''
-    if data_config.SYSTEMTYPE == "MythVantage":
-      #look for the installed prefix
-      cmd="pacman -Q mythtv-release-fixes"
-      rc = mv_common.runcmd(cmd)
-      if rc == 0:
-        postfix = "-release-fixes"
-      else:
-        postfix = "-svn"
-
-      default_disabled = ("mythphone", "mytharchive", "mythbrowser", "mythnews",
-                          "mythgame", "mythflix", "mythweather",
-			  "mythzoneminder" )
-
-      default_installed=("mythcontrols", "mythgallery", "mythmovies",
-                          "mythmusic", "mythsmolt", "mythvideo")
-      other_pkg=("miro", "mednafen", "romdb", "xine", "dvdcss", "webmin" , "fuppes", "foldingathome", "mythappletrailers", "mythstream", "mythvodka")
-    else:
-      default_disabled = ("mythphone", "mytharchive", "mythbrowser", "mythnews",
-                          "mythgame", "mythflix", "mythweather",
-                          "mythappletrailers", "mythstream", "mythvodka",
-			  "mythzoneminder" )
-
-      default_installed=("mythcontrols", "mythgallery", "mythmovies",
-                          "mythmusic", "mythsmolt", "mythvideo")
-      other_pkg=("miro", "mednafen", "romdb", "xine", "dvdcss", "webmin" , "fuppes", "foldingathome")
-
-    for pkg in default_disabled:
-        pkgname=pkg+postfix
-        try:
-            if systemconfig[pkg] == "1":
-                mv_common.pacinstall(pkgname)
-            else:
-                mv_common.pacremove(pkgname)
-        except:
-            logging.debug("  ERROR-- %s is not defined", pkg)
-
-    for pkg in default_installed:
-        try:
-            if systemconfig[pkg] == "0":
-                mv_common.pacremove(pkgname)
-            else:
-                mv_common.pacinstall(pkgname)
-        except:
-            logging.debug("  ERROR-- %s is not defined", pkg)
-
-    for pkg in other_pkg:
-        try:
-            if systemconfig[pkg] == "1":
-                mv_common.pacinstall(pkg)
-            elif systemconfig[pkg] == "0":
-                mv_common.pacremove(pkg)
-        except:
-            logging.debug("   ERROR-- %s is not defined", pkg)
-    logging.info("__End Software\n ")
diff --git a/abs/core-testing/LinHES-config-22/mv_webuser.py b/abs/core-testing/LinHES-config-22/mv_webuser.py
deleted file mode 100755
index a8517a8..0000000
--- a/abs/core-testing/LinHES-config-22/mv_webuser.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging, mv_common
-#import os
-
-def setup_web_auth(UseMythWEB_auth):
-    logging.info("____Start of setup_web_auth____")
-    if UseMythWEB_auth == str(1):
-        #enable auth
-        logging.info("    Enabling authorization for mythweb")
-        cmd='''sed -i "s/^.*include.*auth-inc.conf.*$/include \\"\/etc\/lighttpd\/auth-inc.conf\\"/g" /etc/lighttpd/lighttpd.conf'''
-        mv_common.runcmd(cmd)
-    else:
-        #disable auth
-        logging.info("    Disabling authorization for mythweb")
-        cmd='''sed -i "s/^.*include.*auth-inc.conf.*$/#include \\"\/etc\/lighttpd\/auth-inc.conf\\"/g" /etc/lighttpd/lighttpd.conf'''
-        mv_common.runcmd(cmd)
-    logging.debug("Restarting lighttpd")
-    cmd="sudo sv restart lighttpd"
-    mv_common.runcmd(cmd)
-    logging.info("__End of webauth\n")
-
diff --git a/abs/core-testing/LinHES-config-22/myth_user_call b/abs/core-testing/LinHES-config-22/myth_user_call
deleted file mode 100644
index 0914b03..0000000
--- a/abs/core-testing/LinHES-config-22/myth_user_call
+++ /dev/null
@@ -1,174 +0,0 @@
-#!/bin/bash
-#Wrapper script to manage USERNAME accounts + web security
-# myth_USERNAME_all -c add -u USERNAME
-# myth_USERNAME_all -c delete -u USERNAME
-# myth_USERNAME_all -c pass  -u USERNAME -p pass
-# myth_USERNAME_all -c web  -u USERNAME -p pass
-
-INIT_CHECK=TRUE
-FULL_CALL="$@"
-function CHROOT_CHECK {
-    INIT=`ps -p 1 -o comm=`
-    if [ x$INIT = xrunit ]
-    then
-       CHROOT_NEEDED=FALSE
-    else
-       CHROOT_NEEDED=TRUE
-    fi
-}
-
-function store_commands () {
-    echo "$FULL_CALL" >> /root/myth_user_call.out
-    chmod 600 /root/myth_user_call.out
-}
-
-
-function add_user() {
-    if [ $CHROOT_NEEDED = TRUE ]
-    then
-        echo "calling myth_call_user in chroot to add user"
-        store_commands
-    else
-        echo "adding user $USERNAME"
-	useradd -m -s /bin/bash $USERNAME -G audio,video,optical,storage,users
-    usermod -a -G mythtv $USERNAME
-
-    fi
-
-}
-
-
-function del_user() {
-    if [ $CHROOT_NEEDED = TRUE ]
-    then
-        echo "calling myth_call_user in chroot to delete user"
-        store_commands
-    else
-        echo "removing  user $USERNAME"
-        userdel $USERNAME
-    fi
-
-}
-
-
-function pass_change() {
-    if [ $CHROOT_NEEDED = TRUE ]
-    then
-        echo "calling myth_call_user in chroot to change password"
-        store_commands
-    else
-        echo "changing password for $USERNAME"
-        echo $USERNAME:$PASSWORD | chpasswd
-    fi
-
-}
-
-
-function web_security {
-
-    grep -q ${USERNAME}: /etc/lighttpd/lighttpd.user
-    if [ $? = 0 ]
-    then
-            #delete user
-            sed -i "/${USERNAME}\:/d"  /etc/lighttpd/lighttpd.user
-    fi
-    echo "${USERNAME}:${PASSWORD}" >> /etc/lighttpd/lighttpd.user
-
-}
-
-function ARG_ERR()  {
-        if [  x$OPTARG = "x" ]
-        then
-            echo "$SWITCH NEEDS AND ARG"
-            exit 11
-        fi
-}
-
-
-function print_help {
-
-    echo "Valid options are:"
-    echo "  -c (add|delete|pass|web)"
-    echo "  -u  USERNAMEname"
-    echo "  -p  password"
-    exit 1
-}
-
-if [ $# -eq 0 ]
-then
-    print_help
-fi
-
-declare -r OPTSTRING="c:u:p:i"
-while getopts "$OPTSTRING"  SWITCH
-do
-    case $SWITCH in
-
-            c)  ARG_ERR
-                OPERATION=$OPTARG
-                ;;
-            u)  ARG_ERR
-                USERNAME=$OPTARG
-                ;;
-            p)  ARG_ERR
-                PASSWORD=$OPTARG
-                ;;
-            i)  INIT_CHECK=FALSE
-
-    esac
-done
-
-if [ $INIT_CHECK = TRUE ]
-then
-    CHROOT_CHECK
-else
-    CHROOT_NEEDED=FALSE
-fi
-
-case $OPERATION in
-    add)
-            if [ x$USERNAME = x ]
-            then
-                print_help
-            fi
-            add_user
-        ;;
-    delete)
-            if [ x$USERNAME = x ]
-            then
-                print_help
-            fi
-            del_user
-        ;;
-    pass)
-            if [ x$USERNAME = x ]
-            then
-                print_help
-            fi
-
-            if [ x$PASSWORD = x ]
-            then
-                print_help
-            fi
-            pass_change
-        ;;
-
-    web)
-            if [ x$USERNAME = x ]
-            then
-                print_help
-            fi
-
-
-            if [ x$PASSWORD = x ]
-            then
-                print_help
-            fi
-            echo "adding webUSERNAME $USERNAME with pass $PASSWORD"
-	    web_security
-            ;;
-    *)  print_help
-        ;;
-esac
-
-
diff --git a/abs/core-testing/LinHES-config-22/myth_user_call.py b/abs/core-testing/LinHES-config-22/myth_user_call.py
deleted file mode 100755
index 63915a4..0000000
--- a/abs/core-testing/LinHES-config-22/myth_user_call.py
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-#Wrapper script to manage USERNAME accounts + web security
-# myth_USERNAME_all -c add -u USERNAME
-# myth_USERNAME_all -c delete -u USERNAME
-# myth_USERNAME_all -c pass  -u USERNAME -p pass
-# myth_USERNAME_all -c web  -u USERNAME -p pass
-
-import pexpect, sys, time
-import os, re, getopt
-import mv_common
-
-
-
-
-def chroot_check():
-    if  not INIT_CHECK :
-        return False
-    cmd = '''ps -p 1 -o comm='''
-    init = mv_common.runcmd_output(cmd).strip()
-    if init == "runit":
-        return False
-    else:
-        return True
-
-
-def store_commands(full_call):
-    file_name = "/root/myth_user_call.out"
-    try:
-        f = open(file_name,'a')
-    except:
-        print "%s could not be opened" % file_name
-        sys.exit(1)
-    f.write(full_call)
-    f.write("\n")
-    f.close()
-    try:
-        os.chmod(600,file_name)
-    except:
-        pass
-
-
-def add_user(username,full_call):
-    if chroot_check() :
-        print "calling myth_call_user in chroot to add user"
-        store_commands(full_call)
-    else:
-        print "Adding user %s" %username
-        cmd = '''useradd -m -s /bin/bash %s -G audio,video,optical,storage,users''' %username
-        mv_common.runcmd(cmd)
-        cmd = ''' usermod -a -G mythtv %s ''' %username
-
-
-def del_user(username,full_call):
-    if chroot_check() :
-        print "calling myth_call_user in chroot to del user"
-        store_commands(full_call)
-    else:
-        print "Removing  user %s" %username
-        cmd = '''userdel  %s ''' %username
-        mv_common.runcmd(cmd)
-
-
-def pass_change(username,password,full_call) :
-    if chroot_check() :
-        print "calling myth_call_user in chroot to change password"
-        store_commands(full_call)
-    else:
-        print "changing password for %s" %username
-        passwd = [REDACTED] %s" % username)
-
-        for repeat in (1, 2):
-                passwd.expect("password: ")
-                passwd.sendline(password)
-                time.sleep(0.1)
-
-def web_security(username,password) :
-    file_name = "/etc/lighttpd/lighttpd.user"
-    file_contents = ''
-    if  os.path.exists(file_name):
-        try:
-            f = open(file_name,'r')
-            file_contents = f.readlines()
-        except:
-            print " couldn't read %s" % file_name
-    try:
-        f = open(file_name,'w')
-    except:
-        print "%s could not be opened for writing" % file_name
-        return
-
-    for line in file_contents:
-        if not re.search(username, line):
-            f.write(line)
-    line = "%s:%s" %(username, password)
-    f.write(line)
-    f.write("\n")
-    f.close()
-
-
-def usage ():
-    print "Valid options are:"
-    print "  -c (add|delete|pass|web)"
-    print "  -u  USERNAME"
-    print "  -p  password"
-    sys.exit(0)
-
-def main(argv):
-    global INIT_CHECK
-    full_call = ""
-    INIT_CHECK = True
-    try:
-        opts,  args = getopt.getopt(argv,  'c:u:p:ih' )
-    except getopt.GetoptError, why:
-        print why
-        usage()
-        print "exception happened"
-        sys.exit(2)
-
-    for opt,  arg in opts:
-        if opt in ("-h",  "--help"):
-            usage()
-            sys.exit(0)
-        elif opt in ("-c") :
-            module = arg
-            full_call += ''' -c %s ''' %re.escape(arg)
-        elif opt in ("-u") :
-            username = arg
-            full_call += ''' -u %s ''' %re.escape(arg)
-        elif opt in ("-p") :
-            password = arg
-            full_call += ''' -p %s ''' %re.escape(arg)
-        elif opt in ("-i") :
-            INIT_CHECK = False
-            full_call += ''' -i '''
-    try:
-        username
-    except:
-        usage()
-
-    if module == "add":
-        add_user(username,full_call)
-    elif module == "delete":
-        del_user(username,full_call)
-    elif module == "pass":
-        try:
-            password
-        except:
-            print "needs a password"
-            usage()
-        pass_change(username,password,full_call)
-    elif module == "web":
-        web_security(username,password)
-    else:
-        usage()
-
-if __name__ == "__main__":
-   main(sys.argv[1:])
-
diff --git a/abs/core-testing/LinHES-config-22/networkconfig.sh b/abs/core-testing/LinHES-config-22/networkconfig.sh
deleted file mode 100644
index 770aa98..0000000
--- a/abs/core-testing/LinHES-config-22/networkconfig.sh
+++ /dev/null
@@ -1,341 +0,0 @@
-#!/bin/bash
-#. /etc/profile
-#. /etc/systemconfig
-#BASE=/tmp
-ETCNETDIR=$BASE/etc/net/ifaces
-
-
-
-function kill_dhcp ()
-{
-#for i in ${BASE}/etc/dhcpc/dhcpcd-*.pid
-for i in ${BASE}/var/run/dhcpcd-*.pid
-do
-    if [ -f ${i} ]
-    then
-        pid=`cat ${i}`
-        kill -9 $pid
-        rm -f ${i}
-    fi
-    if [ x$1 = xflush ]
-    then
-        for ifdev in eth0 wlan0 eth1 wlan1
-        do
-           echo ${i} |grep $ifdev
-           status=$?
-           if [ $status = 1 ]
-           then
-             ip address flush $ifdev
-           fi
-        done
-    fi
-
-done
-
-}
-
-function kill_dhcp_chroot ()
-{
-#for i in ${BASE}/etc/dhcpc/dhcpcd-*.pid
-for i in ${mountpoint}/var/run/dhcpcd-*.pid
-do
-    if [ -f ${i} ]
-    then
-        pid=`cat ${i}`
-        kill -9 $pid
-        rm -f ${i}
-    fi
-done
-
-}
-
-
-
-function setup_nameserver(){
-grep -q $1 ${BASE}/etc/resolv.conf
-status=$?
-if [ ! $status = 0 ]
-then
-    echo "nameserver $1" >> ${BASE}/etc/resolv.conf
-fi
-
-}
-
-function change_iface_state () {
-    if [  x$2 =  xenabled ]
-    then
-            echo "setting $1 to active"
-            sed -i -e 's/^ONBOOT=.*$/ONBOOT=yes/g' $ETCNETDIR/$1/options
-            sed -i -e 's/^DISABLED=.*$/DISABLED=no/g' $ETCNETDIR/$1/options
-    else
-            echo "setting $1 to inactive"
-            if [ -e $ETCNETDIR/$1/options ]
-            then
-                sed -i -e 's/^ONBOOT=.*$/ONBOOT=no/g' $ETCNETDIR/$1/options
-                sed -i -e 's/^DISABLED=.*$/DISABLED=yes/g' $ETCNETDIR/$1/options
-            fi
-            /sbin/ifconfig $1 down
-            ip address flush $1
-    fi
-
-}
-
-function setup_interfaces() {
-  local IS_WIRELESS
-  local ip
-  local netmask
-  local isactive
-  local dns
-  local UseDHCP
-  local GW
-  local ESSID
-  local KEY
-  local ENCRYPT
-  local TEMPNET
-  local MTU
-  IS_WIRELESS=false
-
-  #local ip
-  TEMPNET="Hostip"$1
-  echo $TEMPNET
-  eval ip=\$${TEMPNET}
-
-  TEMPNET=Hostnetmask$1
-  eval netmask=\$${TEMPNET}
-  netmask=`echo "$netmask" | cut -d " " -f1`
-
-  TEMPNET=HostActive$1
-  eval isactive=\$${TEMPNET}
-
-  TEMPNET=HostDNS$1
-  eval dns=\$${TEMPNET}
-
-  TEMPNET="HostUSEDHCP"$1
-  eval UseDHCP=\$${TEMPNET}
-
-  TEMPNET=HostGW$1
-  eval GW=\$${TEMPNET}
-
-  TEMPNET=HOST_iswireless$1
-  eval wireless=\$${TEMPNET}
-
-  TEMPNET=HostMTU$1
-  eval MTU=\$${TEMPNET}
-
-
-
-  if [ x$wireless = x1  ]
-  then
-    IS_WIRELESS=TRUE
-    TEMPNET=HostESSID$1
-    eval ESSID=\$${TEMPNET}
-
-    TEMPNET="HostKey"$1
-    eval KEY=\$${TEMPNET}
-
-    TEMPNET=HostUseEncryption$1
-    eval ENCRYPT=\$${TEMPNET}
-  fi
-
-
-  echo "Setup $1 in progress, wireless: $IS_WIRELESS"
-
-    if [ ! -d $ETCNETDIR/$1 ]
-    then
-        mkdir -p $ETCNETDIR/$1
-    fi
-
-    if  [ ! -f  $ETCNETDIR/$1/options ]
-    then
-        cp -f  $TEMPLATES/etcnet/eth/options $ETCNETDIR/$1/options
-    fi
-
-    if [  x$isactive =  x1 ]
-    then
-            change_iface_state $1 enabled
-            #echo "setting $1 to active"
-            #sed -i -e 's/^ONBOOT=.*$/ONBOOT=yes/g' $ETCNETDIR/$1/options
-            #sed -i -e 's/^DISABLED=.*$/DISABLED=no/g' $ETCNETDIR/$1/options
-    else
-            change_iface_state $1 disabled
-            #echo "setting $1 to inactive"
-            #sed -i -e 's/^ONBOOT=.*$/ONBOOT=no/g' $ETCNETDIR/$1/options
-            #sed -i -e 's/^DISABLED=.*$/DISABLED=yes/g' $ETCNETDIR/$1/options
-    fi
-
-    if [ x$IS_WIRELESS =  xTRUE ]
-    then
-            echo "setting $1 wireless"
-            sed -i -e 's/^CONFIG_WIRELESS=.*$/CONFIG_WIRLESS=yes/g' $ETCNETDIR/$1/options
-            #set the key and essid
-            echo "essid  $ESSID" > $ETCNETDIR/$1/iwconfig
-            if  [ x$ENCRYPT = x1 ]
-            then
-                echo "key $KEY" >>  $ETCNETDIR/$1/iwconfig
-            fi
-
-    else
-            echo "disabling wireless"
-            sed -i -e 's/^CONFIG_WIRLESS=.*$/CONFIG_WIRLESS=no/g' $ETCNETDIR/$1/options
-    fi
-
-    if [ x$UseDHCP = x0 ]
-    then
-            echo using dhcp
-            sed -i -e 's/^BOOTPROTO=.*$/BOOTPROTO=dhcp/g' $ETCNETDIR/$1/options
-
-    else
-        echo "using static ip"
-        sed -i -e 's/^BOOTPROTO=.*$/BOOTPROTO=static/g' $ETCNETDIR/$1/options
-        echo "default via $GW" > $ETCNETDIR/$1/ipv4route
-        echo "$ip$netmask" > $ETCNETDIR/$1/ipv4address
-        setup_nameserver $dns
-    fi
-
-    if [  x$MTU = x ]
-    then
-        echo "MTU is blank, card will use default values"
-        sed -i '/^mtu.*$/d' /etc/net/ifaces/$1/iplink
-    else
-        echo "setting mtu for $1 to $MTU"
-        sed -i '/^mtu.*$/d' /etc/net/ifaces/$1/iplink
-        echo "mtu $MTU  " >> /etc/net/ifaces/$1/iplink
-    fi
-}
-
-
-function find_active () {
-#HostActiveeth1="1"
-rm -f ${BASE}/etc/resolv.conf
-if [ x$MYTHDHCP =  x1 ]
-           then
-            #add 127.0.0.1 to /etc/resolv.conf
-                 echo "search lan" > ${BASE}/etc/resolv.conf
-                 echo "nameserver 127.0.0.1" >> ${BASE}/etc/resolv.conf
- fi
-
-for i in eth0 eth1 wlan0 wlan1
-do
-    CURRENTIF="HostActive"$i
-    eval IFSTATE=\$${CURRENTIF}
-    echo $IFSTATE "---"
-        echo $i
-    if [ x$IFSTATE = x1 ]
-    then
-        setup_interfaces $i
-    else
-        change_iface_state $i disabled
-    fi
-done
-
-}
-
-function setup_hostname {
-#set the hostname
-if [ !  x$hostname = x ]
-then
-    echo $hostname > ${BASE}/etc/hostname
-    cat $BASE/etc/hosts |grep -v 127.0.0.1|grep -v $hostname  > /tmp/hosts
-    #cat $BASE/etc/hosts |grep -v 127.0.0.1|grep -v $hostname | grep -v $ip > /tmp/hosts
-
-    if [ x$MYTHDHCP =  x1 ]
-    then
-        echo "127.0.0.1  localhost " >  ${BASE}/etc/hosts
-        echo "$MYTHIP $hostname   " >>  ${BASE}/etc/hosts
-    else
-        echo "127.0.0.1 $hostname  localhost " >  ${BASE}/etc/hosts
-    fi
-    cat /tmp/hosts >> ${BASE}/etc/hosts
-fi
-
-kill_dhcp
-}
-
-function vnc_check() {
-    CMDLINE=$(cat /proc/cmdline)
-    echo $CMDLINE |grep -q vnc
-    USEVNC=$?
-    echo $CMDLINE |grep -q nfsroot
-     NETBOOT=$?
-    echo $USEVNC
-    if [ !  x$USEVNC = x0  ]
-    then
-        echo "not using vnc"
-        if [ !  x$NETBOOT = x0  ]
-        then
-            echo "not using netboot"
-        else
-            echo "using netboot"
-            USEVNC=0
-        fi
-
-    else
-        echo " using vnc"
-    fi
-}
-
-function setup_MYTH_vars {
-    TEMPMYTH="Hostip"$default_interface
-    #echo $TEMPMYTH
-    eval MYTHIP=\$${TEMPMYTH}
-
-    TEMPMYTH="HostUSEDHCP"$default_interface
-    eval MYTHDHCP=\$${TEMPMYTH}
-
-
-
-}
-
-
-
-
-function start_network {
-if [ ! $USEVNC = 0 ]
-then
-    /etc/net/scripts/network.init reload
-    /etc/net/scripts/network.init restart
-else
-    echo "VNC/NETBOOT in use, will NOT restart network"
-fi
-
-}
-
-function setup_network {
-    setup_MYTH_vars
-    setup_hostname
-    find_active
-}
-
-
-function stop_network {
-if [ ! $USEVNC = 0 ]
-then
-    echo "stopping the network"
-    kill_dhcp flush
-    ip address flush dev eth0 2>&1 >/dev/null
-    ip address flush dev eth1 2>&1 >/dev/null
-    ip address flush dev wlan0 2>&1 >/dev/null
-    ip address flush dev wlan1 2>&1 >/dev/null
-else
-    echo "VNC/NETBOOT in use, will NOT restart network"
-fi
-
-}
-
-
-#this is used by the install process to start the network
-function install_network_setup {
-    setup_MYTH_vars
-    setup_hostname
-    stop_network
-    find_active
-    start_network
-
-}
-
-
-
-
-
-
-
diff --git a/abs/core-testing/LinHES-config-22/remove_service.sh b/abs/core-testing/LinHES-config-22/remove_service.sh
deleted file mode 100755
index 6cc4b4f..0000000
--- a/abs/core-testing/LinHES-config-22/remove_service.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-SERVICE_DIR=/var/service
-SCRIPT_DIR=/etc/sv
-if [ -e $SERVICE_DIR/$1 ]
-then
-		echo "removing"
- rm $SERVICE_DIR/$1
-fi
diff --git a/abs/core-testing/LinHES-config-22/restore_default_settings.sh b/abs/core-testing/LinHES-config-22/restore_default_settings.sh
deleted file mode 100755
index dcf5e23..0000000
--- a/abs/core-testing/LinHES-config-22/restore_default_settings.sh
+++ /dev/null
@@ -1,362 +0,0 @@
-#!/bin/bash
-. /etc/profile
-. /etc/systemconfig
-shopt -s -o nounset
-echo $@ >>  /tmp/restore.out
-#TEMPLATES="/usr/share/templates/settings"
-TEMPLATES="$TEMPLATES/settings"
-TABLES="settings keybindings"
-MYTHDBUSER=mythtv
-MYTHTVPASSWD=[REDACTED]
-declare -r OPTSTRING="c:e:t:d:h:s:a:z:Ho"
-Thistemplate=""
-declare -i OVERRIDE=0
-declare -i EVERYTHING=0
-
-
-function CMD_DEFINE () {
-     #add override check
-    if  [ x$Thistemplate = xsyssettings  -a  $OVERRIDE  -eq 1   ]
-    then
-         MYSQLCMD="mysql  --local-infile  -s -u$MYTHDBUSER  -p$MYTHTVPASSWD -h$ovdbhost mythconverg -B --exec"
-         MYSQLCMD_C="mysql -u$MYTHDBUSER  -p$MYTHTVPASSWD -h$ovdbhost mythconverg -B --exec"
-         MYSQLCMD_UPDATE_HOST="UPDATE settings set data='$oldhostname' where value='HostMyhostname' and hostname=\"$hostname\";"
-    else
-        MYSQLCMD="mysql  --local-infile  -s -u$MYTHDBUSER  -p$MYTHTVPASSWD -h$dbhost mythconverg -B --exec"
-        MYSQLCMD_C="mysql -u$MYTHDBUSER  -p$MYTHTVPASSWD -h$dbhost mythconverg -B --exec"
-        MYSQLCMD_UPDATE_HOST="select hostname from settings;"
-    fi
-}
-
-function SQL_DEFINE () {
-    thostname=`echo ${hostname}|tr -C [:alpha:] _`
-    echo "Using $thostname for temp table postfix"
-
-	#$1 is the table name
-	if [ $1 = "settings" ]
-	then
-		ALTERSQL="Alter table  temp_${1}_${thostname} add unique ( value )"
-	else
-		ALTERSQL=";"
-	fi
-
-    CREATESQL="create table  temp_${1}_${thostname} like $1;"
-	COPY_TMP_SQL="replace  into  temp_${1}_${thostname}  (select * from $1 where hostname=\"$hostname\");"
-	INSERTSQL="LOAD DATA local INFILE '/tmp/$1.txt' REPLACE INTO TABLE temp_${1}_${thostname}  FIELDS TERMINATED BY '\t';"
-    #INSERTSQL="LOAD DATA local INFILE '$TEMPLATES/$Thistemplate/$1.txt' REPLACE INTO TABLE temp_${1}_${hostname}  FIELDS TERMINATED BY '\t';"
-	DROPSQL="delete  from $1 where hostname=\"$hostname\";"
-	COPY_BCK_SQL="replace  into $1   (select * from  temp_${1}_${thostname}  where hostname=\"$hostname\");"
-	DROP_TABLE="Drop table temp_${1}_${thostname}"
-}
-
-function ARG_ERR()  {
-        if [  x$OPTARG = "x" ]
-        then
-            echo "$SWITCH NEEDS AND ARG"
-            exit 11
-        fi
-}
-
-function ALSADEVICE () {
-#ALSA:hw:1,4
-    if [ x$Audiotype = xALSA ]
-    then
-        SoundDevice=ALSA:$SoundDevice
-        MixerDevice="ALSA:default"
-    else
-        MixerDevice="/dev/mixer"
-    fi
-
-}
-
-
-
-if [ $# -eq 0 ]
-then
-    echo "Valid options are:"
-    echo "  -c (save|restore|load|uhostname|BECONFIG|ZIP|ACCESSCONTROL)"
-    echo "  -t (syssettings|hostsettings)"
-    echo "  -d databasename"
-    echo "  -h hostname"
-    echo "  -s systemtype (master|slave|standalone|frontendonly)"
-    echo "  -a ipaddress"
-    echo "  -z zipcode"
-    echo "  -o  override (only used upgrade installs)"
-    exit 1
-fi
-
-
-
-
-while getopts "$OPTSTRING"  SWITCH
-do
-    case $SWITCH in
-        #  \?)  echo "unkown option"
-                #       exit 11 ;;
-            c)   echo "$SWITCH"  "$OPTARG"
-                    ARG_ERR
-                    OPERATION=$OPTARG
-                    ;;
-            t) echo "$SWITCH"  "$OPTARG"
-                    ARG_ERR
-                    Thistemplate=$OPTARG
-
-                     if  [  x$Thistemplate = x"syssettings"  ]
-                     then
-                            echo "template is syssettings"
-                            loadhost=false
-                    elif [  x$Thistemplate = x"hostsettings"  ]
-                    then
-                            echo "template is hostsettings"
-                            Thistemplate=syssettings
-                            loadhost=true
-                    else
-                            echo "invalid template name"
-                            exit 1
-                    fi
-                    ;;
-            d) echo "$SWITCH"  "$OPTARG"
-                    ARG_ERR
-                    if [ $OVERRIDE =  1 ]
-                    then
-                        ovdbhost=$OPTARG
-                    else
-                        dbhost=$OPTARG
-                    fi
-                    ;;
-            h) echo "$SWITCH"  "$OPTARG"
-                    ARG_ERR
-                    if [ $OVERRIDE =  1 ]
-                    then
-                       oldhostname=$hostname
-                        hostname=$OPTARG
-                    else
-                        hostname=$OPTARG
-                   fi
-
-                                  ;;
-            s) echo "$SWITCH"  "$OPTARG"
-                    ARG_ERR
-                    SYSTEMTYPE=$OPTARG
-                        ;;
-            a) echo "$SWITCH"  "$OPTARG"
-                    ARG_ERR
-                    IP_ADDRESS=$OPTARG
-                    ;;
-            z) echo "$SWITCH"  "$OPTARG"
-                   ARG_ERR
-                   ZIPCODE=$OPTARG
-                    ;;
-           o)  OVERRIDE=1
-                 ;;
-
-            esac
-done
-
-echo $OVERRIDE
-
-#setup the Mysql commands
-CMD_DEFINE
-
-$MYSQLCMD_C "show tables" > /dev/null
-status=$?
-if [ $status = 1 ]
-then
-    echo "$@ failed"
-    echo "$@ failed" >> /tmp/restore.out
-    exit 1
-fi
-
-
-
-
-
-
-
-case $OPERATION in
-
-	restore)
-		#used to restore settings from syssettings
-		if  [ -d $TEMPLATES/$Thistemplate ]
-		then
-            cd $TEMPLATES/$Thistemplate
-            if [ $loadhost = false ]
-                then
-                    for i in $TABLES
-                    do
-                        SQL_DEFINE $i
-                        sed -e "s/REPLACEME/$hostname/g"  $i.txt  > /tmp/$i.txt
-                        #echo    $MYSQLCMD "$SELECTSQL"
-                        echo $i
-                        $MYSQLCMD "$CREATESQL"
-                        $MYSQLCMD "$ALTERSQL"
-                        $MYSQLCMD "$COPY_TMP_SQL"
-                        $MYSQLCMD "$INSERTSQL"
-                        $MYSQLCMD "$DROPSQL"
-                        $MYSQLCMD "$COPY_BCK_SQL "
-                        $MYSQLCMD "$DROP_TABLE "
-                        #rm /tmp/$i.txt
-                    done
-            fi
-            if [ $loadhost = true ]
-            then
-                #only load the settings table with values HOST
-                i=settings
-                SQL_DEFINE $i
-                sed -e "s/REPLACEME/$hostname/g"  $i.txt  > /tmp/$i.txt
-                echo $i
-                $MYSQLCMD "$CREATESQL"
-                $MYSQLCMD "$ALTERSQL"
-                $MYSQLCMD "$INSERTSQL"
-                $MYSQLCMD "$COPY_TMP_SQL"
-                $MYSQLCMD "$DROPSQL"
-                $MYSQLCMD "$COPY_BCK_SQL"
-                $MYSQLCMD "$DROP_TABLE "
-            fi
-		else
-		 echo "couldn't find $TEMPLATES/$Thistemplate"
-		fi
-	;;
-
-	save)
-
-                if [ ! -d $TEMPLATES/$Thistemplate ]
-                then
-                    mkdir -p $TEMPLATES/$Thistemplate
-                fi
-
-                cd $TEMPLATES/$Thistemplate
-        		for i in $TABLES
-		        do
-                     EXTRACLAUSE=""
-                    case $i in
-                    settings)
-                        EXTRACLAUSE="and  not (value like \"BackendServerIP\") and not (value like \"locale\")  order by value"
-                       	SQL="select value,data,'REPLACEME' as hostname from $i where hostname=\"$hostname\" "$EXTRACLAUSE"  ;"
-                    #    SQL="select * from $i where hostname=\"$hostname\" "$EXTRACLAUSE"  ;"
-             	        $MYSQLCMD_C "$SQL" > $TEMPLATES/$Thistemplate/$i.txt
-                           ;;
-                      keybindings)
-                                SQL="select context,action,description,keylist,'REPLACEME' as hostname from $i where hostname=\"$hostname\"  "$EXTRACLAUSE"  ;"
-                                $MYSQLCMD_C "$SQL" > $TEMPLATES/$Thistemplate/$i.txt
-                            ;;
-                    esac
-	                  #  sed -e "s/$hostname/REPLACEME/g"  $i  > $i.txt && rm $i
-
-                done
-		;;
-
-    load)
-
-                #will load both default_1 and default_2  unless either file is not found
-                for i in default_1 default_2
-                do
-                    if [ -f $TEMPLATES/$i/settings.txt   ]
-                    then
-                           echo $i
-                          for tablename in $TABLES
-                            do
-                         #create table
-                            CREATESQL="create table IF NOT EXISTS ${tablename}_${i} like $tablename;"
-                            $MYSQLCMD_C "$CREATESQL"
-                         #truncate table
-                            TRUNCATESQL="truncate ${tablename}_${i}  "
-                            $MYSQLCMD_C "$TRUNCATESQL"
-                         #load table
-                              INSERTSQL="LOAD DATA local INFILE '$TEMPLATES/$i/$tablename.txt' REPLACE INTO TABLE ${tablename}_${i}   FIELDS TERMINATED BY '\t';"
-                                $MYSQLCMD_C "$INSERTSQL"
-                         #update_hostname
-                              UPDATEHOSTNAMESQL="update  ${tablename}_${i}  set hostname='$i'  ; "
-                                $MYSQLCMD_C "$UPDATEHOSTNAMESQL"
-                           done
-                    else
-
-                        echo "couldn't find $TEMPLATES/$i/settings.txt  template to load"
-                    fi
-                    CREATESQL="create table IF NOT EXISTS settings_user1  like settings;"
-                    $MYSQLCMD_C "$CREATESQL"
-                    CREATESQL="create table IF NOT EXISTS settings_user2  like settings;"
-                    $MYSQLCMD_C "$CREATESQL"
-                    CREATESQL="create table IF NOT EXISTS settings_user3  like settings;"
-                    $MYSQLCMD_C "$CREATESQL"
-
-                    CREATESQL="create table IF NOT EXISTS keybindings_user1  like keybindings;"
-                    $MYSQLCMD_C "$CREATESQL"
-                    CREATESQL="create table IF NOT EXISTS keybindings_user2  like keybindings;"
-                    $MYSQLCMD_C "$CREATESQL"
-                    CREATESQL="create table IF NOT EXISTS keybindings_user3  like keybindings;"
-                    $MYSQLCMD_C "$CREATESQL"
-                done
-;;
-
-
-
-        BECONFIG)
-                if [ $SYSTEMTYPE = "master" ]
-                then
-                        $MYSQLCMD_C "UPDATE settings  set data='${IP_ADDRESS}' where value='MasterServerIP';"
-                        $MYSQLCMD_C "delete  from   settings    where value='BackendServerIP'  and  hostname=\"$hostname\";"
-                        $MYSQLCMD_C "REPLACE INTO settings set  data='${IP_ADDRESS}' , value='BackendServerIP' ,  hostname=\"$hostname\";"
-                fi
-
-                if [ $SYSTEMTYPE = "slave" ]
-                then
-                        $MYSQLCMD_C "delete  from   settings    where value='BackendServerIP'  and  hostname=\"$hostname\";"
-	    		        $MYSQLCMD_C "REPLACE INTO settings  set data='${IP_ADDRESS}' , value='BackendServerIP' , hostname=\"$hostname\";"
-                fi
-                ;;
-        ZIP)
-               $MYSQLCMD_C "delete from settings where  value='locale' and  hostname=\"$hostname\";"
-               $MYSQLCMD_C "REPLACE INTO  settings set data='$ZIPCODE'  ,  value='locale' , hostname=\"$hostname\";"
-               $MYSQLCMD_C "delete from settings where  value='MythMovies.ZipCode' and  hostname=\"$hostname\";"
-               $MYSQLCMD_C "REPLACE INTO  settings set data='$ZIPCODE',  value='MythMovies.ZipCode' , hostname=\"$hostname\";"
-                ;;
-        MUSICFRONT)
-                ALSADEVICE
-                $MYSQLCMD_C "delete from settings where value='AudioOutputDevice' and hostname=\"$hostname\";"
-                $MYSQLCMD_C "delete from settings where value='MixerDevice' and hostname=\"$hostname\";"
-                $MYSQLCMD_C "REPLACE INTO  settings set data='$SoundDevice',  value='AudioOutputDevice' , hostname=\"$hostname\";"
-                $MYSQLCMD_C "REPLACE INTO  settings set data='$MixerDevice',  value='MixerDevice' , hostname=\"$hostname\";"
-                #need to reload the settings.
-                systemconfig.sh reloadfe
-                ;;
-        MUSICMYTH)
-            ALSADEVICE
-            $MYSQLCMD_C "delete from settings where value='MusicAudioDevice' and hostname=\"$hostname\";"
-            $MYSQLCMD_C "REPLACE INTO  settings set data='$SoundDevice',  value='MusicAudioDevice' , hostname=\"$hostname\";"
-                ;;
-         uhostname)
-                    #used when the hostname is changed.
-                    TABLES="settings capturecard keybindings storagegroup recorded"
-                    for i in $TABLES
-                    do
-                        USQL="update $i set hostname=\"$oldhostname\"  where hostname=\"$hostname\"  ;"
-                        $MYSQLCMD_C "$USQL"
-                    done
-
-                ;;
-        USERJOBALLOW)
-                SQL="update settings set data='1' where value like  'JobAllowUserJob%' and hostname=\"$hostname\"  ;"
-                $MYSQLCMD_C "$SQL"
-                ;;
-
-        ACCESSCONTROL)
-                LIST="Hostaccessnetwork Hostaccesshostype HostaccesshostypeSystemtype Hostaccessmisc Hostaccesssleep Hostaccessadvanced HostaccessadvancedX Hostaccesssound"
-
-                for i in $LIST
-                do
-                    $MYSQLCMD_C "delete from settings where value=\"$i\" and hostname=\"$hostname\";"
-                    $MYSQLCMD_C "REPLACE INTO  settings set data='1',  value=\"$i\" , hostname=\"$hostname\";"
-                done
-                SQL="update settings set data='0' where value='HostaccesshostypeSystemtype' and hostname=\"$hostname\"  ;"
-                $MYSQLCMD_C "$SQL"
-                SQL="update settings set data='0' where value='Hostaccessuser' and hostname=\"$hostname\"  ;"
-                $MYSQLCMD_C "$SQL"
-                ;;
-	esac
-
-#SELECT * INTO OUTFILE 'data.txt'
-# FIELDS TERMINATED BY ','
-# FROM table2;
-
-
diff --git a/abs/core-testing/LinHES-config-22/restore_km_db_chroot.sh b/abs/core-testing/LinHES-config-22/restore_km_db_chroot.sh
deleted file mode 100644
index e72e8c2..0000000
--- a/abs/core-testing/LinHES-config-22/restore_km_db_chroot.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-. /etc/profile
-. /etc/systemconfig
-. $MV_ROOT/bin/install_functions.sh
-
-myhost=$hostname
-hostname $myhost
-mount -t proc none /proc
-DBFILE=$1
-
-if  [ $SystemType = "Master_backend" -o $SystemType = "Standalone"  ]
-    then
-        #restore database
-        pacman --noconfirm -Sf mysql
-        status=1
-        mysqlstatus=1
-        while [ ! $status = 0  ]
-        do
-            /etc/rc.d/mysqld stop
-            sleep 1
-            /etc/rc.d/mysqld start
-            mysqlstatus=$?
-            if [ $mysqlstatus = 0 ]
-            then
-                mysql -e "show databases;"
-                showstatus=$?
-                if [ $showstatus = 0 ]
-                then
-                   #load database
-                   pacman --noconfirm -R mythdb-initial
-                   pacman --noconfirm  -S mythdb-initial
-
-                   if [ -f $DBFILE ]
-                   then
-                        echo "restoring old database"
-                        gunzip -c $DBFILE > /tmp/mythconverg.sql
-                        mysql  mythconverg < /tmp/mythconverg.sql
-                        update_db_settings HostServiceMythWEB "1"
-                        echo 'UseMythWEB="1"' >> /etc/systemconfig
-                   else
-                        echo "Could not restore old database, mythconverg.sql is missing."
-                        touch /tmp/.upgrade_db_failed
-                   fi
-
-                    if [ -d /data/srv/mysql/mythconverg ]
-                    then
-                        status=0
-                    fi
-                fi
-            fi
-        done
-        rm -f /tmp/mythconverg.sql
-    else
-        exit 0
-    fi
-
-#/etc/rc.d/mysqld stop
-#umount /proc
-
-
-
diff --git a/abs/core-testing/LinHES-config-22/soundconfig.sh b/abs/core-testing/LinHES-config-22/soundconfig.sh
deleted file mode 100755
index 75998d6..0000000
--- a/abs/core-testing/LinHES-config-22/soundconfig.sh
+++ /dev/null
@@ -1,254 +0,0 @@
-#!/bin/bash
-. /etc/systemconfig
-. /etc/profile
-echo $@ >/tmp/audio.call
-#set -x
-BASE=""
-. /etc/profile
-#TEMPLATES="/usr/share/templates"
-#TESTFILE="$TEMPLATES/audio/space_battle_A.wav"
-TESTFILE="/usr/share/sounds/alsa/Front_Center.wav"
-OSSinstalled="false"
-
-function testaudio () {
-
-ossplay  -d$AUDIODEVICE $TESTFILE
-
-}
-
-function load_alsa() {
-
-    remove_service.sh alsa-utils
-#    cd /lib/modules/2.6.21-STB
-    KER=`uname -r`
-    cd /lib/modules/$KER/kernel/
-    tar -xvf /lib/modules/alsa-$KER.tar
-    pacman -Sf --noconfirm  alsa-lib
-
-    depmod -a
-    cd -
-    udevadm trigger
-    udevadm settle
-    udevadm trigger
-
-    add_service.sh alsa-utils
-    sleep 4
-    sv start alsa-utils
-}
-
-
-function unload_alsa () {
-#kill $(lsof -t /dev/dsp* /dev/audio* /dev/mixer* /dev/snd/*) && modprobe -r $(lsmod |grep ^snd |awk '{print $1}')
-    sv stop alsa-utils
-    remove_service.sh alsa-utils
-    rm -rf /dev/adsp*
-    rm -rf /dev/snd/*
-    rm -rf /dev/audio
-    modprobe -r $(lsmod |grep ^snd |awk '{print $1}')
-}
-
-function unload_oss {
-    sv stop oss
-    soundoff
-    rm -rf /dev/dsp*
-    rm -rf /dev/oss*
-    rm -rf /dev/sndstat
-    remove_service.sh oss
-}
-
-function installOSS {
-    echo "installing oss"
-    pacman -Q oss 2>/dev/null
-    if [  ! $? = 0 ]
-    then
-        pacman --noconfirm -Sf oss
-    fi
-    add_service.sh oss
-    sleep 4
-    sv start oss
-}
-
-
-function SYNCXINE {
-echo "modify xine config file"
-    if [ -f /data/home/mythtv/.xine/config ]
-    then
-        cp -f /data/home/mythtv/.xine/config  $TEMPLATES/xine.config
-    else
-        cp $TEMPLATES/xine.config.template $TEMPLATES/xine.config
-    fi
-
-    if [ x$Audiotype = xOSS ]
-    then
-       DEVICENUMBER=`echo $SoundDevice|awk -F/ ' { print $3  } '|tr -d dsp `
-        sed -e "s/^.*audio.driver.*$/audio.driver:oss/" \
-               -e "s/^.audio.device.oss_device_name.*$/audio.device.oss_device_name:\/dev\/dsp/" \
-               -e "s/^.audio.devic.oss_device_number.*$/audio.device.oss_device_number:$DEVICENUMER/" \
-               -e "s/^.*audio.output.speaker_arrangement:.*$/Audio.output.speaker_arrangement:PassThrough/" \
-                $TEMPLATES/xine.config > /data/home/mythtv/.xine/config
-    else
-        cp $TEMPLATES/xine.config /data/home/mythtv/.xine/config
-    fi
-
-}
-
-function SYNCMPLAYER {
-echo "modify mplayer not implmented yet"
-}
-
-function SYNCMYTHMUSIC {
-echo "sync mythmusic"
-$MV_ROOT/bin/restore_default_settings.sh -c MUSICMYTH
-}
-
-function SYNCMYTHFRONTEND {
-echo "sync mythfrontend"
-$MV_ROOT/bin/restore_default_settings.sh -c MUSICFRONT
-}
-
-
-function checkOSSinstalled () {
- ossinfo |grep Version |grep -q OSS >/dev/null
- resultcode=$?
- echo $resultcode
- if [ $resultcode = 0 ]
- then
-    OSSinstalled='true'
- else
-    OSSinstalled='false'
- fi
-}
-
-function sound_config_system {
-
-    if [ x$syncXine = x1 ]
-    then
-          SYNCXINE
-    fi
-    if [ x$syncMplayer = x1 ]
-    then
-          SYNCMPLAYER
-    fi
-    if [ x$syncMythMusic = x1 ]
-    then
-          SYNCMYTHMUSIC
-    fi
-    if [ x$syncMythFrontend = x1 ]
-    then
-          SYNCMYTHFRONTEND
-    fi
-
-}
-
-function loadsound (){
-        checkOSSinstalled
-        if [  x$AUDIOTYPE = xOSS  -o   x$AUDIOTYPE = xoss ]
-        #then
-        #    if [ $OSSinstalled = "false" ]
-            then
-                while [ $OSSinstalled = "false" ]
-                do
-                    unload_alsa
-                    rm /tmp/.alsatest
-                    installOSS
-                    installOSS
-                    sleep 2
-                    checkOSSinstalled
-                done
-          #  fi
-        else
-            touch /tmp/.alsatest
-            unload_oss
-            load_alsa
-            load_alsa
-            rm /tmp/.alsatest
-
-        fi
-
-}
-
-
-
-
-#####################MAIN PROGRAM##########################
-
-declare -r OPTSTRING="i:t:d:"
-
-if [ $# -eq 0 ]
-then
-    echo "Valid options are:"
-    echo "  -i  (oss|alsa)   oss or alsa subsystem  "
-    echo "  -t  (test|real|LOAD)   "
-    echo "  -d device"
-    exit 1
-fi
-
-
-
-
-while getopts "$OPTSTRING"  SWITCH
-do
-    case $SWITCH in
-          \?)  echo "unkown option"
-                      exit 11 ;;
-            i)   echo "$SWITCH"  "$OPTARG"
-                    AUDIOTYPE="$OPTARG"
-                    ;;
-            d) echo "$SWITCH"  "$OPTARG"
-                    AUDIODEVICE=$OPTARG
-                    ;;
-            t) echo "$SWITCH"  "$OPTARG"
-                SOUNDOPTYPE="$OPTARG"
-                if  [ x"$OPTARG" = xtest ]
-                then
-                    TEST=true
-                else
-                    TEST=false
-                fi
-
-
-                    ;;
-
-            esac
-done
-
-
-
-
-case $SOUNDOPTYPE in
-    REAL|real )
-                    loadsound
-                    sound_config_system
-        ;;
-    test|TEST)
-                echo $@ > /tmp/audio.test
-                #loadsound
-                 if [  x$AUDIOTYPE = xOSS  -o   x$AUDIOTYPE = xoss ]
-                then
-                    echo "testing OSS  $AUDIODEVICE "
-                    ossplay  -d$AUDIODEVICE $TESTFILE
-                else
-                    echo "testing ALSA $AUDIODEVICE "
-                    aplay --device=$AUDIODEVICE $TESTFILE
-                fi
-
-        ;;
-
-    LOAD|load)
-                        loadsound
-        ;;
-    esac
-
-
-exit 0
-
-
-
-
-
-
-
-
-
-
-
diff --git a/abs/core-testing/LinHES-config-22/startx b/abs/core-testing/LinHES-config-22/startx
deleted file mode 100755
index 75ba06a..0000000
--- a/abs/core-testing/LinHES-config-22/startx
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-. /etc/profile
-
-export USER=root
-export HOME=/root
-#TEMPLATES=/usr/share/templates
-
-CMDLINE=$(cat /proc/cmdline)
-TEMPVAR=${CMDLINE#*ip=}
-IP=${TEMPVAR%% *}
-echo $CMDLINE |grep -q vnc
-USEVNC=$?
-
-if [ x$USEVNC = x1 ]
-then
-	$MV_ROOT/bin/xconfig.sh
-	cat /etc/X11/xorg.conf | sed -e 's/dev\/mouse/dev\/psaux/g'> /root/xorg.conf.install
-	startx /root/live-install.sh -- -logverbose 6 -config /root/xorg.conf.install -allowMouseOpenFail
- else
- #VNC
-     pacman -Sf --noconfirm tightvnc
-    cd /root
-    mkdir .vnc
-    echo mythvantage |vncpasswd -f > /root/.vnc/passwd
-    chmod 500 /root/.vnc/passwd
-    rm /root/.vnc/xstartup
-    ln -s /root/live-install.sh /root/.vnc/xstartup
-    vncserver
-fi
diff --git a/abs/core-testing/LinHES-config-22/systemconfig.py b/abs/core-testing/LinHES-config-22/systemconfig.py
deleted file mode 100755
index 28e2e7a..0000000
--- a/abs/core-testing/LinHES-config-22/systemconfig.py
+++ /dev/null
@@ -1,244 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-import sys,  os,  commands,  glob,  time
-import getopt,  re,  MySQLdb
-import logging
-import mv_common , mv_network
-import inspect
-#____________________________________________setup the logging______________________________________________________
-LOG_FILENAME = '/tmp/systemconfig.log'
-DEBUGLOG = '/tmp/systemconfig_debug.log'
-logging.basicConfig(level=logging.DEBUG,
-                    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
-                    datefmt='%m-%d %H:%M',
-                    filename=DEBUGLOG,
-                    filemode='w')
-# define a Handler which writes INFO messages or higher to the sys.stderr
-console = logging.StreamHandler()
-console.setLevel(logging.INFO)
-# set a format which is simpler for console use
-#formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s')
-formatter = logging.Formatter("%(message)s")
-# tell the handler to use this format
-console.setFormatter(formatter)
-# add the handler to the root logger
-logging.getLogger('').addHandler(console)
-
-#infoformatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
-infoformatter = logging.Formatter("%(message)s")
-infofile = logging.FileHandler(LOG_FILENAME, 'w')
-infofile.setFormatter(infoformatter)
-infofile.setLevel(logging.INFO)
-logging.getLogger('').addHandler(infofile)
-
-
-def usage():
-    logging.info("tell people how to use this")
-
-def setup_x(systemconfig):
-    cmd = "%s/bin/xconfig.sh" %systemconfig["MVROOT"]
-    mv_common.runcmd(cmd)
-
-def main(argv):
-    try:
-        MVROOT = os.environ["MV_ROOT"]
-    except:
-        logging.debug("MVROOT was not defined, using the default value")
-        MVROOT = "/usr/MythVantage"
-
-    global cmdmodule
-    global systemconfig
-    systemconfig["MVROOT"]=MVROOT
-    restartlcd = False
-    cmdmodule={"misc":False , "sleep":False , "hostype":False , "hostypec":False , "advanced":False , "audio":False , "network":False , "advancedX":False , "webuser":False , "restartfe":False , "reloadfe":False , "ddns":False , "screensaver":False , "ir":False , "this_is_install":False , "user":False, "software":False, "plugins":False, "smolt":False, "all":False, "dhcp_request":False }
-    try:
-        opts,  args = getopt.getopt(argv,  'c:hm:d:',  ["help","modules" ] )
-    except getopt.GetoptError, why:
-        print why
-        usage()
-        print "exception happened"
-        sys.exit(2)
-    for opt,  arg in opts:
-        if opt in ("-h",  "--help"):
-            usage()
-            sys.exit(0)
-        elif opt in ("-m"):
-            for i in arg.split(","):
-                cmdmodule[i]=True
-        elif opt in ("-d"):
-            dhcp_dev = arg
-
-
-    if cmdmodule["this_is_install"] or cmdmodule["hostypec"]:
-        systemconfig["hostypec"] = True
-        cmdmodule["smolt"] = True
-
-    systemconfig["mythip"] = mv_network.setup_MYTH_IP(systemconfig)
-    systemconfig["mythdhcp"] = mv_network.setup_MYTH_DHCP(systemconfig)
-    systemconfig["mythgw"] = mv_network.setup_MYTH_DHCP(systemconfig)
-    systemconfig["mythdns"] = mv_network.setup_MYTH_DHCP(systemconfig)
-
-    if cmdmodule["all"]:
-        logging.info("***    WILL RUN ALL MODULES   ***")
-        cmdmodule["hostype"] = True
-        cmdmodule["ir"]= True
-        cmdmodule["network"] = True
-        cmdmodule["audio"] = True
-        cmdmodule["misc"] = True
-        cmdmodule["sleep"] = True
-        cmdmodule["webuser"] = True
-        cmdmodule["ddns"] = True
-        cmdmodule["screensaver"] = True
-        cmdmodule["advanced"] = True
-        cmdmodule["software"] = True
-        cmdmodule["advancedX"] = True
-        cmdmodule["smolt"] = True
-        cmdmodule["user"] = True
-
-
-    if cmdmodule["hostype"]:
-        import mv_hostype
-        cmdmodule["advancedX"] = True
-        setup_x(systemconfig)
-        cmdmodule["ir"] = True
-        mv_hostype.hostypeprint(systemconfig)
-        cmdmodule["smolt"] = True
-
-    if cmdmodule["network"]:
-        restartfe = mv_network.setup_network(systemconfig, cmdmodule["this_is_install"])
-        if restartfe == True :
-            logging.debug("    Setting the frontend to restart due to network change")
-            cmdmodule["restartfe"] = True
-
-
-
-    if cmdmodule["ir"] == True:
-        import mv_ir
-        restart = mv_ir.setup_ir(systemconfig,data_config)
-        restartfe = restart[0]
-        restartlcd = restart[1]
-        if restartfe == True :
-            logging.debug("    Setting the frontend to restart due to lirc change")
-            cmdmodule["restartfe"] = True
-        cmdmodule["smolt"] = True
-
-
-    if cmdmodule["audio"] == True:
-        logging.debug("______Start of Audio Configuration______")
-        if not systemconfig["Audiotype"] == "tinker":
-            cmd="%s/bin/soundconfig.sh -t real -i %s -d %s" %(MVROOT,systemconfig["Audiotype"],systemconfig["SoundDevice"])
-            mv_common.runcmd(cmd)
-        else:
-            logging.debug("    Tinker mode(audio), not changing configuration")
-        logging.debug("__End of audio")
-
-    if cmdmodule["misc"]:
-        import mv_misc
-        mv_misc.setup_zip(MVROOT,systemconfig["zipcode"])
-        mv_misc.setup_tz(systemconfig["timezone"],systemconfig["TEMPLATES"])
-        mv_misc.setup_nfs(systemconfig)
-
-    if cmdmodule["sleep"]:
-        import mv_misc
-        mv_misc.setup_sleep(systemconfig)
-
-    if cmdmodule["webuser"]:
-        import mv_webuser
-        mv_webuser.setup_web_auth(systemconfig["UseMythWEB_auth"])
-
-    if cmdmodule["ddns"]:
-        import mv_ddns
-        mv_ddns.setup_ddns(systemconfig)
-
-    if cmdmodule["screensaver"]:
-        import mv_screensaver
-        mv_screensaver.setup_screensaver(systemconfig, data_config)
-
-    if cmdmodule["advanced"]:
-        import mv_advanced
-        mv_advanced.setup_advanced(systemconfig, data_config)
-
-    if cmdmodule["software"] or cmdmodule["plugins"]:
-        import mv_software
-        mv_software.setup_software(systemconfig, data_config)
-
-    if cmdmodule["advancedX"]:
-        setup_x(systemconfig)
-
-    if cmdmodule["restartfe"]:
-        mv_common.restartfe(restartlcd)
-
-    if cmdmodule["reloadfe"]:
-        mv_common.reloadfe(systemconfig["dbhost"],restartlcd)
-
-    if cmdmodule["smolt"]:
-        import mv_smolt
-        mv_smolt.setup_smolt_type(systemconfig["SystemType"],
-                                  systemconfig["Remotetype"],
-                                  systemconfig["RunFrontend"],
-                                  data_config.MYTHHOME,
-                                  data_config.SYSTEMTYPE)
-
-    if cmdmodule["user"]:
-        logging.info("____Start of ssh user____")
-        if systemconfig["rootSSH"] == "1" :
-            logging.info("    Allowing ssh access for root")
-            cmd = '''sed -i "s/^.*PermitRootLogin.*$/PermitRootLogin yes/" /etc/ssh/sshd_config'''
-            mv_common.runcmd(cmd)
-        else:
-            logging.info("    Removing ssh access for root")
-            cmd = '''sed -i "s/^.*PermitRootLogin.*$/PermitRootLogin no/" /etc/ssh/sshd_config'''
-            mv_common.runcmd(cmd)
-        logging.info("__End of ssh user\n")
-
-    if cmdmodule["dhcp_request"]:
-        cmd = '''dhcpcd -t4 -h' ' -Td %s > /tmp/mvnetwork.dhcpinfo ''' %dhcp_dev
-        mv_common.runcmd(cmd)
-
-
-if __name__ == "__main__":
-
-    config_file = "mv_config"
-    data_config = __import__(config_file,  globals(),  locals(),  [])
-    #Read in systemconfig
-    global systemconfig
-    systemconfig = {"hostypec":False}
-    file_name = "/etc/systemconfig"
-    try:
-        config_file = open(file_name)
-    except:
-        logging.critical("%s could not be opened", file_name)
-        sys.exit(1)
-
-    for line in config_file:
-        line = line.strip()
-        if line and line[0] is not "#" and line[-1] is not "=":
-            var, val = line.rsplit("=", 1)
-            val = val.strip('"')
-            systemconfig[var.strip()] = val.strip()
-    try:
-        systemconfig["TEMPLATES"] = os.environ["TEMPLATES"]
-    except:
-        logging.critical("    *TEMPLATES is not defined")
-        logging.critical("    *using default value")
-        systemconfig["TEMPLATES"] = "/usr/MythVantage/templates"
-
-    logging.debug("______START OF DEBUG______")
-    main(sys.argv[1:])
-    logging.debug("______cmd line options______")
-    for i in cmdmodule.items():
-        logging.debug (i)
-    logging.debug("______systemconfig______")
-    for i in systemconfig.items():
-        logging.debug(i)
-    #pass
-
-
-
-
-
-
-
-
-
-
diff --git a/abs/core-testing/LinHES-config-22/systemconfig.sh b/abs/core-testing/LinHES-config-22/systemconfig.sh
deleted file mode 100755
index 218f705..0000000
--- a/abs/core-testing/LinHES-config-22/systemconfig.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-###################################################################
-#Script to configure your system based off the values in /etc/systemconfig
-#Any changes made to config files will be removed when systemconfig.sh is run
-#
-#JM
-echo $@ >/tmp/systemconfig.call
-echo "----------------------start of systemconfig $@ ----------------------"
-. /etc/profile
-. $MV_ROOT/bin/networkconfig.sh
-postfix=`cat ${BASE}/usr/local/share/mythtv/.releasetype`
-
-systemconfig.py -m $@
-rc=$?
-echo "systemconfig.py exit code $rc"
-exit $rc
-
-
-
diff --git a/abs/core-testing/LinHES-config-22/timezip.py b/abs/core-testing/LinHES-config-22/timezip.py
deleted file mode 100755
index bf6b389..0000000
--- a/abs/core-testing/LinHES-config-22/timezip.py
+++ /dev/null
@@ -1,232 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-# import MySQL module
-#used to import the zipcode/timezone/nfs info fromMBE
-import MySQLdb
-import sys
-import getopt
-import socket
-
-
-def usage():
-    print " -h --help"
-    print " -d  --installdb"
-    print " -m --masterdb"
-    print " -n  --hostname of current machine"
-
-def printvars():
-    print "masterdb: " + masterdb
-    print "installdb:" + installdb
-    print "hostname: " + thishostname
-    print "BEhostname:" + BEhostname
-    print "zipcode:" + zipcode
-    print "timezone:" + tz
-    print "timezone region:" + tz_region
-    print "timezone subregion:" + tz_subregion
-    print "nfsip:" + nfsip
-    print "nfstoggle:" + nfstoggle
-    print "nfsmount:"  + nfsmount
-    print "hobbitclient:" + hobbitclient
-# connect
-def selectvars():
-
-    global BEhostname
-    global zipcode
-    global tz
-    global tz_region
-    global tz_subregion
-    global nfsip
-    global nfstoggle
-    global nfsmount
-    global hobbitclient
-
-    db = MySQLdb.connect(host=masterdb, user="mythtv", passwd="[REDACTED] db="mythconverg")
-    # create a cursor
-    cursor = db.cursor()
-    # execute SQL statement
-    cursor.execute("select hostname from settings where value='BackendServerIP' and data=(%s)",(masterdb))
-    result = cursor.fetchone()
-    try:
-        BEhostname=result[0]
-    except TypeError:
-        BEhostname=""
-
-    cursor.execute("select data from settings where value='HostZipcode' and hostname=(%s)",(BEhostname))
-    result = cursor.fetchone()
-    try:
-        zipcode =  result[0]
-    except TypeError:
-        zipcode=""
-
-    cursor.execute("select data from settings where value='HostCentralNFSIP' and hostname=(%s)",(BEhostname))
-    result = cursor.fetchone()
-    try:
-        nfsip=result[0]
-    except TypeError:
-        nfsip=""
-
-    cursor.execute("select data from settings where value='HostHaveCentralNFS' and hostname=(%s)",(BEhostname))
-    result = cursor.fetchone()
-    try:
-        nfstoggle=result[0]
-    except TypeError:
-        nfstoggle=""
-
-    cursor.execute("select data from settings where value='HostNFSmountpoint' and hostname=(%s)",(BEhostname))
-    result = cursor.fetchone()
-    try:
-        nfsmount=result[0]
-    except TypeError:
-        nfsmount=""
-
-    cursor.execute("select data from settings where value='HostTimeZone' and hostname=(%s)",(BEhostname))
-    result = cursor.fetchone()
-    try:
-        tz=result[0]
-    except TypeError:
-        tz=""
-##########
-    cursor.execute("select data from settings where value='HostTimeZoneRegion' and hostname=(%s)",(BEhostname))
-    result = cursor.fetchone()
-    try:
-        tz_region=result[0]
-    except TypeError:
-        tz_region=""
-    tempsubregion="HostTimeZoneRegion_" + tz_region
-
-    cursor.execute("select data from settings where value=%s and hostname=(%s)",(tempsubregion,BEhostname))
-    result = cursor.fetchone()
-    try:
-        tz_subregion=result[0]
-    except TypeError:
-        tz_subregion=""
-###############
-    if  ( thishostname != BEhostname ):
-        cursor.execute("select data from settings where value='GlobalServiceHobbitserver'")
-        result = cursor.fetchone()
-        try:
-            hobbitclient=result[0]
-        except TypeError:
-            hobbitclient="1"
-
-
-
-def insertvars():
-
-    db = MySQLdb.connect(host=installdb, user="mythtv", passwd="[REDACTED] db="mythconverg")
-    cursor = db.cursor()
-#inserting the zipcode
-    cursor.execute("select * from settings where value='HostZipcode' and hostname=(%s)",(thishostname))
-    result = cursor.fetchone()
-    if ( zipcode!="" ):
-        if (result == None):
-            cursor.execute("INSERT INTO  settings (value,data,hostname) VALUES ('HostZipcode',(%s),(%s))",(zipcode,thishostname))
-            print "inserting zipcode"
-        else:
-            cursor.execute("update settings set data=(%s) where hostname=(%s) and value='HostZipcode'",(zipcode,thishostname))
-            print "updating zipcode"
-
-#inserting the timezone
-    cursor.execute("select *  from settings where value='HostTimeZone' and hostname=(%s)",(thishostname))
-    result = cursor.fetchone()
-    if ( tz != ""):
-         if (result == None):
-            cursor.execute("INSERT INTO  settings (value,data,hostname) VALUES ('HostTimeZone',(%s),(%s))",(tz,thishostname))
-            print "inserting timezone"
-         else:
-            cursor.execute("update settings set data=(%s) where hostname=(%s) and value='HostTimeZone'",(tz,thishostname))
-            print "updating timezone"
-
-    cursor.execute("select *  from settings where value='HostTimeZoneRegion' and hostname=(%s)",(thishostname))
-    result = cursor.fetchone()
-    if ( tz != ""):
-         if (result == None):
-            cursor.execute("INSERT INTO  settings (value,data,hostname) VALUES ('HostTimeZoneRegion',(%s),(%s))",(tz_region,thishostname))
-            print "inserting timezone region"
-         else:
-            cursor.execute("update settings set data=(%s) where hostname=(%s) and value='HostTimeZoneRegion'",(tz_region,thishostname))
-            print "updating timezone region"
-
-    tempsubregion="HostTimeZoneRegion_" + tz_region
-    cursor.execute("select *  from settings where value=%s and hostname=(%s)",(tempsubregion,thishostname))
-    result = cursor.fetchone()
-    if ( tz != ""):
-         if (result == None):
-            cursor.execute("INSERT INTO  settings (value,data,hostname) VALUES ((%s),(%s),(%s))",(tempsubregion,tz_subregion,thishostname))
-            print "inserting timezone subregion"
-         else:
-            cursor.execute("update settings set data=(%s) where hostname=(%s) and value=(%s)",(tempsubregion,tz_subregion,thishostname))
-            print "updating timezone subregion"
-
-
-#start of NFSIP
-    cursor.execute("select data from settings where value='HostCentralNFSIP' and hostname=(%s)",(thishostname))
-    result = cursor.fetchone()
-    if ( nfsip != ""):
-        if (result == None):
-            cursor.execute("INSERT INTO  settings (value,data,hostname) VALUES ('HostCentralNFSIP',(%s),(%s))",(nfsip,thishostname))
-            print "inserting nfsip"
-
-    if (nfstoggle != ""):
-        cursor.execute("select data from settings where value='HostHaveCentralNFS' and hostname=(%s)",(thishostname))
-        result = cursor.fetchone()
-        if (result == None):
-            cursor.execute("INSERT INTO  settings (value,data,hostname) VALUES ('HostHaveCentralNFS',(%s),(%s))",(nfstoggle,thishostname))
-            print "inserting nfstoggle"
-
-    if ( nfsmount !="") :
-        cursor.execute("select data from settings where value='HostNFSmountpoint' and hostname=(%s)",(thishostname))
-        result = cursor.fetchone()
-        if (result == None):
-            cursor.execute("INSERT INTO  settings (value,data,hostname) VALUES ('HostNFSmountpoint',(%s),(%s))",(nfsmount,thishostname))
-            print "inserting nfsmountpoint"
-
-#hobbitclient
-    cursor.execute("select *  from settings where value='HostServiceHobbitclient' and hostname=(%s)",(thishostname))
-    result = cursor.fetchone()
-    if ( tz != ""):
-         if (result == None):
-            cursor.execute("INSERT INTO  settings (value,data,hostname) VALUES ('HostServiceHobbitclient',(%s),(%s))",(hobbitclient,thishostname))
-            print "inserting hobbitcleint"
-         else:
-            cursor.execute("update settings set data=(%s) where hostname=(%s) and value='HostServiceHobbitclient'",(hobbitclient,thishostname))
-            print "updating hobbitclient"
-
-
-def main(argv):
-    global masterdb
-    global installdb
-    global thishostname
-    thishostname=""
-    global BEhostname
-    global zipcode
-    global tz
-    global tz_region
-    global tz_subregion
-
-    global nfsip
-    global hobbitclient
-    try:
-        opts, args = getopt.getopt(argv, "hm:d:n:", ["help", "masterdb=", "installdb=" , "hostname=" ] )
-    except getopt.GetoptError:
-        sys.exit(2)
-    for opt, arg in opts:
-        if opt in ("-h", "--help"):
-             usage()
-             sys.exit()
-        elif opt in ( "-d" , "--installdb"):
-             installdb = arg
-        elif opt in ("-m", "--masterdb"):
-             masterdb = arg
-        elif opt in ("-n", "--hostname"):
-             thishostname = arg
-
-    if ( thishostname == "" ):
-         thishostname = socket.gethostname()
-
-    selectvars()
-    printvars()
-    insertvars()
-if __name__ == "__main__":
-    main(sys.argv[1:])
-
diff --git a/abs/core-testing/LinHES-config-22/xconfig.sh b/abs/core-testing/LinHES-config-22/xconfig.sh
deleted file mode 100755
index 2fad821..0000000
--- a/abs/core-testing/LinHES-config-22/xconfig.sh
+++ /dev/null
@@ -1,363 +0,0 @@
-#!/bin/bash
-#SET DISPLAYCARD to force a cardtype
-#SET DISPLAYRES to force Xres, ENV takes precendent over cmdline
-#displayres=cmdline
-#NVPKGS="ati-dri xf86-video-ati xf86-video-radeonhd intel-dri xf86-video-intel unichrome-dri xf86-video-unichrome xf86-video-mga xf86-video-savage xf86-video-trident"
-NVPKGS="ati-dri xf86-video-ati xf86-video-radeonhd intel-dri xf86-video-intel xf86-video-mga xf86-video-savage xf86-video-trident unichrome-dri xf86-video-openchrome"
-BASE=""
-. /etc/profile
-NVIDIA_96XX="$TEMPLATES/xorg/96xx_supported.txt"
-#TEMPLATES="/usr/share/templates"
-MYTHHOME=$BASE/home/mythtv
-
-function Xvalues {
-    CMDLINE=$(cat /proc/cmdline)
-    echo "$CMDLINE" | grep -q forceXvesa
-    if [ $? = 0  ]
-    then
-        VGACARDTYPE=vesa
-        Xcardtype=$VGACARDTYPE
-    else
-        VGACARDTYPE=`lspci | grep -i vga | sort -r | head -n 1 | cut -d: -f3 | cut -d" " -f2`
-        VGAPCIID=`lspci | grep -i vga | sort -r | head -n 1 | cut -d" " -f1`
-        CARDID=`lspci -n | grep "$VGAPCIID" | grep 10de | cut -d" " -f3 | cut -d: -f2`
-        VENDORID=`lspci -n | grep "$VGAPCIID" | grep 10de | cut -d" " -f3 | cut -d: -f1`
-    fi
-    #force VGACARDTYPE
-    if [ ! x$DISPLAYCARD = x ]
-    then
-        VGACARDTYPE=$DISPLAYCARD
-        Xcardtype=$VGACARDTYPE
-    fi
-    echo "Will use $VGACARDTYPE"
-    currentmode=`cat "$BASE/etc/X11/xorg.conf" | grep Modes | awk -Fs '{ print $2 }'`
-}
-
-function presetupX {
-    if [ -f /etc/sysconfig/IGNORE_X ]
-    then
-        echo "Will not run xconfig.sh due to presence of /etc/sysconfig/IGNORE_X"
-        return 1
-    else
-        if  [ "$XIgnoreConfig" = 1 ]
-        then
-            echo "Using User supplied X"
-            if [ -f "$MYTHHOME/templates/xorg.user" ]
-            then
-                cp -f "$MYTHHOME/templates/xorg.user" "$XORG_CONF"
-            else
-                echo "Didn't find the file"
-                echo "Copy your config file to $MYTHHOME/templates/xorg.user" > "$XORG_CONF"
-            fi
-        else
-            if [ "$XUseAdvanced" = 1 ]
-            then
-                setupAdvancedX
-            else
-                setupX
-            fi
-        fi
-    fi
-
-}
-
-function setupAdvancedX {
-    echo "#doing the advanced" > /tmp/options
-    Xcategory=`echo "$Xresadvanced" | cut -d_ -f1`
-    Xres=`echo "$Xresadvanced" | cut -d_ -f2`
-    echo "$Xcategory"
-    if [ "$Xcategory" = "nVidia Modeline" ]
-    then
-        Xres=""
-        if [ "$XnVidia1080p" = "1" ]
-        then
-            Xres="${Xres} \"1920x1080_60\""
-        fi
-        if [ "$XnVidia1080i" = "1" ]
-        then
-            Xres="${Xres}  \"1920x1080_60i\""
-        fi
-        if [ "$XnVidia720p" = "1" ]
-        then
-            Xres="${Xres}  \"1280x720_60\""
-        fi
-        if [ "$XnVidia480p" = "1" ]
-        then
-            Xres="${Xres}  \"720x480_60\""
-        fi
-            ML="\t Modes ${Xres}"
-    else
-
-    ML="\t Modes \"${Xres}\""
-    fi
-#    echo $ML
-    case $Xcardtype in
-        NVIDIA|nVidia|nvidia)
-            case $Xconnection in
-                DVI)    ConnectedMonitor=DFP ;;
-                vga)    ConnectedMonitor=CRT;;
-                Auto)   ConnectedMonitor=Auto;;
-                TV)     ConnectedMonitor=TV
-                        echo "Option \"TVStandard\" \"$XTVstandard\""  >>/tmp/options
-                        echo "Option \"TVOutFormat\" \"$XTVconnection\"" >> /tmp/options
-                    ;;
-            esac
-            if [ "$ConnectedMonitor" = Auto ]
-            then
-                echo "auto connection"
-            else
-                echo "Option \"ConnectedMonitor\" \"$ConnectedMonitor\"" >> /tmp/options
-                echo "Option \"FlatPanelProperties\" \"Scaling = centered, Dithering = enabled\"" >> /tmp/options
-                echo "Option \"DigitalVibrance\" \"0\"" >> /tmp/options
-            fi
-
-            if  [ "$XignoreEDID" = 1 ]
-            then
-                EDIDvalue=true
-                EDIDFREQ=false
-                DS="    DisplaySize $XDisplaysize"
-                HS="    HorizSync   $XHsync"
-                VR="    VertRefresh $XVrefresh"
-            else
-                EDIDvalue=false
-                EDIDFREQ=true
-                DS="# Display size edid used "
-                HS="# Hsync edid used "
-                VR="# Vertrefresh edid used "
-            fi
-            echo "Option  \"UseEdidFreqs\" \"$EDIDFREQ\"" >> /tmp/options
-            echo "Option  \"IgnoreEDID\" \"$EDIDvalue\"" >> /tmp/options
-
-
-            sed -e "s/^.*Modes.*$/${ML}/" \
-                -e "/INSERT MODELINE/r  $TEMPLATES/xorg/modeline.$Xcategory" \
-                -e "s/^.*DisplaySize.*$/ $DS/" \
-                -e "s/^#.*HorizSync.*$/ $HS/g" \
-                -e "s/^#.*VertRefresh.*$/ $VR/g" \
-                -e "/INSERT HERE/r /tmp/options" "$TEMPLATES/xorg/xorg.conf.nvidia" > "$XORG_CONF"
-            ;;
-
-        ati|ATI)
-            case $Xconnection in
-                DVI)    ConnectedMonitor="tmds1,nocrt1,notv";;
-                VGA)    ConnectedMonitor="crt1,notmds1,notv" ;;
-                TV)     ConnectedMonitor="tv,nocrt1,notmds1"
-                        echo "Option \"TVStandard\" \"$XTVstandard\""  >>/tmp/options
-                        echo "Option \"TVFormat\" \"$XTVconnection\"" >> /tmp/options
-                    ;;
-            esac
-            if  [ "$XignoreEDID" = 1 ]
-            then
-                DS="    DisplaySize $XDisplaysize"
-                HS="    HorizSync   $XHsync"
-                VR="    VertRefresh $XVrefresh"
-            else
-                DS="# Display size edid used "
-                HS="# Hsync edid used "
-                VR="# Vertrefresh edid used "
-            fi
-
-            echo "Option \"ForceMonitors\" \"$ConnectedMonitor\"" >> /tmp/options
-
-            sed -e "s/^.*Modes.*$/\t $ML/" \
-                -e "/INSERT MODELINE/r  $TEMPLATES/xorg/modeline.$Xcategory" \
-                -e "s/^.*DisplaySize.*$/ $DS/" \
-                -e "s/^#.*HorizSync.*$/ $HS/g" \
-                -e "s/^#.*VertRefresh.*$/ $VR/g" \
-                -e "/INSERT HERE/r /tmp/options" "$TEMPLATES/xorg/xorg.conf.ati"  > "$XORG_CONF"
-            ;;
-
-        via|VIA|Via|S3)
-            # Need to add appropriate Modules, Device and DRI sections
-            # See the http://www.mythtv.org/wiki/XvMC wiki page
-            echo "no via here"
-            ;;
-
-        *)
-            echo "unknown card type"
-            ;;
-    esac
-}
-
-
-function setupX {
-    Xvalues
-    #echo "$currentmode  ____   ${Xres}"
-    #if [ "${currentmode}" != \"${Xres}\" ]
-    if [ x = x ]
-    then
-        case $VGACARDTYPE in
-            nVidia)
-                if [ ${Xres} = Auto ]
-                then
-                    sed -e "/^.*Modes.*$/d" "$TEMPLATES/xorg/xorg.conf.nvidia" > "$XORG_CONF"
-                else
-                    sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.nvidia" > "$XORG_CONF"
-                fi
-                if [ "$TESTMODE" != "test" ]
-                then
-                    #nvidia check right here
-                    grep -qi "$CARDID" "$NVIDIA_96XX"
-                    if [ $? = 0 ]
-                    then
-                        #install 96xx drivers
-                        echo "installing nvidia 96xx drivers"
-                        pacman --noconfirm  -Rd libgl > /dev/null 2>&1
-                        pacman --noconfirm  -R $NVPKGS > /dev/null 2>&1
-                        pacman --noconfirm  -S nvidia-96xx nvidia-96xx-utils  > /dev/null 2>&1
-                    else
-                        #install latest drivers
-                        echo "installing current nvidia drivers"
-                        pacman --noconfirm  -Rd libgl > /dev/null 2>&1
-                        pacman --noconfirm  -R $NVPKGS > /dev/null 2>&1
-                        pacman --noconfirm  -S nvidia nvidia-utils > /dev/null 2>&1
-                    fi
-                fi
-	        echo "/usr/lib/libXvMCNVIDIA_dynamic.so.1" > "$XVMC_CONFIG"
-                ;;
-
-      #      VMware)
-      #              sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.vmware" > "$XORG_CONF"
-      #              ;;
-
-            VIA|S3)
-                # There are actually multiple options here
-                # xf86-video-openchrome
-                # xf86-video-unichrome
-                # There is also a seperate driver for the Unichrome Pro
-                if [ ${Xres} = Auto ]
-                then
-                    sed -e "/^.*Modes.*$/d" "$TEMPLATES/xorg/xorg.conf.via" > "$XORG_CONF"
-                else
-                    sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.via" > "$XORG_CONF"
-                fi
-                if [ "$TESTMODE" != "test" ]
-                then
-                    if [ "$OPENCHROME" = "1" ]
-                    then
-                        pacman --noconfirm  -R nvidia nvidia-utils > /dev/null 2>&1
-                        pacman --noconfirm  -S libgl unichrome-dri xf86-video-openchrome > /dev/null 2>&1
-                    else
-                        pacman --noconfirm  -R nvidia nvidia-utils > /dev/null 2>&1
-                        pacman --noconfirm  -S libgl unichrome-dri xf86-video-unichrome > /dev/null 2>&1
-                    fi
-                fi
-                # I'm making educated guesses here...
-                if lspci | grep "VGA" | grep -qi "Unichrome Pro"
-                then
-                    if [ -f "/usr/lib/libchromeXvMCPro.so.1" ]
-                    then
-	                echo "/usr/lib/libchromeXvMCPro.so.1" > "$XVMC_CONFIG"
-                    else
-	                echo "/usr/lib/libviaXvMCPro.so.1" > "$XVMC_CONFIG"
-                    fi
-                else
-                    if [ -f "/usr/lib/libchromeXvMC.so.1" ]
-                    then
-	                echo "/usr/lib/libchromeXvMC.so.1" > "$XVMC_CONFIG"
-                    else
-                        echo "/usr/lib/libviaXvMC.so.1" > "$XVMC_CONFIG"
-                    fi
-                fi
-                ;;
-
-            Intel|intel)
-               if [ ${Xres} = Auto ]
-                then
-                    sed -e "/^.*Modes.*$/d" "$TEMPLATES/xorg/xorg.conf.intel" > "$XORG_CONF"
-                else
-                    sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.intel" > "$XORG_CONF"
-                fi
-                if [ "$TESTMODE" != "test" ]
-                then
-                    pacman --noconfirm -R nvidia-utils > /dev/null 2>&1
-                    pacman --noconfirm -S libgl > /dev/null 2>&1
-                fi
-	        echo "/usr/lib/libIntelXvMC.so.1" > "$XVMC_CONFIG"
-                ;;
-
-            vesa|InnoTek)
-                if [ ${Xres} = Auto ]
-                then
-                    sed -e "/^.*Modes.*$/d" "$TEMPLATES/xorg/xorg.conf.vesa" > "$XORG_CONF"
-                else
-                    sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.vesa" > "$XORG_CONF"
-                fi
-                ;;
-
-            *)
-                XCONF=/root/xorg.conf.new
-                XCONFB=/etc/X11/xorg.conf.install
-                X -configure
-                if [ -f "$XCONF" ]
-                then
-                    echo "Using $XCONF"
-                    if [ ${Xres} = Auto ]
-                    then
-                        grep -v Modes "$XCONF" | sed -e 's/dev\/mouse/dev\/psaux/g'> "$XORG_CONF"
-                    else
-                        grep -v Modes "$XCONF" | sed -e "/Depth.*16/a Modes \"${Xres}\" " -e "/Depth.*24/a Modes \"${Xres}\""     -e 's/dev\/mouse/dev\/psaux/g'> "$XORG_CONF"
-                    fi
-                elif [ -f "$XCONFB" ]
-                then
-                    echo "Using $XCONFB"
-                    if [ ${Xres} = Auto ]
-                    then
-                        sed -e "/^.*Modes.*$/d" "$XCONFB" > "$XORG_CONF"
-                    else
-                        sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$XCONFB" > "$XORG_CONF"
-                    fi
-                else
-                    echo "Xorg configuration failed"
-                fi
-                rm -f "$XCONF" 2>&1 > /dev/null
-                ;;
-        esac
-    fi
-
-}
-
-#MAIN
-TESTMODE="$1"
-if [ "$TESTMODE" = "test" ]
-then
-    XORG_CONF="/tmp/xorg.conf.test"
-    XVMC_CONFIG="/tmp/XvMCConfig.test"
-    XUseAdvanced="1"
-    XIgnoreConfig="${2}"
-    Xcardtype="${3}"
-    XIgnoreEDID="${4}"
-    Xconnection="${5}"
-    XHsync="${6}"
-    XVrefresh="${7}"
-    Xresadvanced="${8}"
-    XTVstandard="${9}"
-    XTVconnection="${10}"
-    XDisplaysize="${11}"
-else
-    if [ -f /etc/systemconfig ]
-    then
-        . /etc/systemconfig
-    else
-        Xres="800x600"
-    fi
-    CMDLINE=$(cat /proc/cmdline)
-    echo $CMDLINE | grep -q displayres
-    if [ $? = 0 ]
-    then
-        TEMPVAR=${CMDLINE#*displayres=}
-        DSR=${TEMPVAR%% *}
-    fi
-    if [ ! x$DSR = x ]
-    then
-        Xres=$DSR
-    fi
-    if [ ! x$DISPLAYRES = x ]
-    then
-        Xres=$DISPLAYRES
-    fi
-
-    XORG_CONF="/etc/X11/xorg.conf"
-    XVMC_CONFIG="/etc/X11/XvMCConfig"
-fi
-presetupX
diff --git a/abs/core-testing/LinHES-config/LinHES-release b/abs/core-testing/LinHES-config/LinHES-release
index 6a885f4..06c4105 100644
--- a/abs/core-testing/LinHES-config/LinHES-release
+++ b/abs/core-testing/LinHES-config/LinHES-release
@@ -1 +1 @@
-LinHES R6.01.00 (Chugu)
+LinHES R6.01.01 (Rhinestone)
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index 72aa4d4..0d5d945 100644
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,19 +1,18 @@
 pkgname=LinHES-config
 pkgver=2.1
-pkgrel=8
-conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
+pkgrel=12
+conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
 pkgdesc="Install and configure your system"
-depends=(bc libstatgrab  mysql-python expect curl dnsutils parted 
-	 sg3_utils nmbscan system-templates rsync python-parted 
-	 ddcxinfo python-pexpect python-netifaces LinHES-timezone 
-	 python-iplib mythinstall)
+depends=('bc' 'libstatgrab'  'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' 
+	 'sg3_utils' 'nmbscan' 'system-templates' 'rsync' 'python-parted' 
+	 'ddcxinfo' 'python-pexpect' 'python-netifaces' 'LinHES-timezone' 
+	 'python-iplib' 'mythinstall>=2-10')
 arch=('i686')
 
 source=(mv_install.py 
 	mv_config.py 
 	myth_user_call 
 	file_time_offset.py 
-	install-ui.xml 
 	install_proxy.sh 
 	install_functions.sh 
 	systemconfig.sh 
@@ -98,6 +97,4 @@ build() {
     install -m 0755 LinHES-release $startdir/pkg/etc/LinHES-release
     install -m 0755 issue $startdir/pkg/etc/issue
 
-    # copy over the ui files
-    install -m 0755 install-ui.xml $startdir/pkg/usr/share/mythtv/themes/default/
 }
diff --git a/abs/core-testing/mythdb-initial/PKGBUILD b/abs/core-testing/mythdb-initial/PKGBUILD
new file mode 100755
index 0000000..a7c7ffa
--- /dev/null
+++ b/abs/core-testing/mythdb-initial/PKGBUILD
@@ -0,0 +1,21 @@
+pkgname=mythdb-initial
+pkgver=1
+pkgrel=43
+pkgdesc="setup the initial mythtv database for linhes"
+url=""
+license=""
+depends=(mysql)
+makedepends=()
+conflicts=()
+replaces=()
+backup=()
+install=mythdb.install
+source=(mc.sql permissions.sql)
+md5sums=()
+arch=('i686')
+build() {
+  cd $startdir/src
+  mkdir -p $startdir/pkg/data/database
+  cp mc.sql  $startdir/pkg/data/database/mc.sql.initial
+  cp permissions.sql  $startdir/pkg/data/database/permissions.sql
+}
diff --git a/abs/core-testing/mythdb-initial/__changelog b/abs/core-testing/mythdb-initial/__changelog
new file mode 100644
index 0000000..c53f2f6
--- /dev/null
+++ b/abs/core-testing/mythdb-initial/__changelog
@@ -0,0 +1,25 @@
+
+
+INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES 
+('Hostpluginmytharchive','1','larch5'),
+('Hostpluginmythbrowser','1','larch5'),
+('Hostpluginmythcontrols','1','larch5'),
+('Hostpluginmythflix','1','larch5'),
+('Hostpluginmythgallery','1','larch5'),
+('Hostpluginmythgame','1','larch5'),
+('HostpluginmythgameFceu','1','larch5'),
+('HostpluginmythgameMame','1','larch5'),
+('HostpluginmythgameZsnes','1','larch5'),
+('Hostpluginmythmovietime','1','larch5'),
+('Hostpluginmythmusic','1','larch5'),
+('Hostpluginmythnews','1','larch5'),
+('Hostpluginmythphone','1','larch5'),
+('Hostpluginmythsmolt','1','larch5'),
+('Hostpluginmythvideo','1','larch5'),
+('Hostpluginmythvideo_dvdcss','0','larch5'),
+('Hostpluginmythweather','1','larch5'),
+('HostAudiotype','ALSA','larch5')
+
+INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
+('WOLbackendReconnectWaitTime','5',NULL);
+
diff --git a/abs/core-testing/mythdb-initial/mc.sql b/abs/core-testing/mythdb-initial/mc.sql
new file mode 100644
index 0000000..a898fe9
--- /dev/null
+++ b/abs/core-testing/mythdb-initial/mc.sql
@@ -0,0 +1,2911 @@
+-- MySQL dump 10.11
+--
+-- Host: localhost    Database: mythconverg
+-- ------------------------------------------------------
+-- Server version	5.0.75
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `archiveitems`
+--
+
+DROP TABLE IF EXISTS `archiveitems`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `archiveitems` (
+  `intid` int(10) unsigned NOT NULL auto_increment,
+  `type` set('Recording','Video','File') character set latin1 default NULL,
+  `title` varchar(128) default NULL,
+  `subtitle` varchar(128) default NULL,
+  `description` text,
+  `startdate` varchar(30) default NULL,
+  `starttime` varchar(30) default NULL,
+  `size` bigint(20) unsigned NOT NULL,
+  `filename` text NOT NULL,
+  `hascutlist` tinyint(1) NOT NULL default '0',
+  `cutlist` text,
+  `duration` int(10) unsigned NOT NULL default '0',
+  `cutduration` int(10) unsigned NOT NULL default '0',
+  `videowidth` int(10) unsigned NOT NULL default '0',
+  `videoheight` int(10) unsigned NOT NULL default '0',
+  `filecodec` varchar(50) NOT NULL default '',
+  `videocodec` varchar(50) NOT NULL default '',
+  `encoderprofile` varchar(50) NOT NULL default 'NONE',
+  PRIMARY KEY  (`intid`),
+  KEY `title` (`title`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `archiveitems`
+--
+
+LOCK TABLES `archiveitems` WRITE;
+/*!40000 ALTER TABLE `archiveitems` DISABLE KEYS */;
+/*!40000 ALTER TABLE `archiveitems` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `callsignnetworkmap`
+--
+
+DROP TABLE IF EXISTS `callsignnetworkmap`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `callsignnetworkmap` (
+  `id` int(11) NOT NULL auto_increment,
+  `callsign` varchar(20) NOT NULL default '',
+  `network` varchar(20) NOT NULL default '',
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `callsign` (`callsign`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `callsignnetworkmap`
+--
+
+LOCK TABLES `callsignnetworkmap` WRITE;
+/*!40000 ALTER TABLE `callsignnetworkmap` DISABLE KEYS */;
+/*!40000 ALTER TABLE `callsignnetworkmap` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `capturecard`
+--
+
+DROP TABLE IF EXISTS `capturecard`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `capturecard` (
+  `cardid` int(10) unsigned NOT NULL auto_increment,
+  `videodevice` varchar(128) default NULL,
+  `audiodevice` varchar(128) default NULL,
+  `vbidevice` varchar(128) default NULL,
+  `cardtype` varchar(32) default 'V4L',
+  `defaultinput` varchar(32) default 'Television',
+  `audioratelimit` int(11) default NULL,
+  `hostname` varchar(64) default NULL,
+  `dvb_swfilter` int(11) default '0',
+  `dvb_sat_type` int(11) NOT NULL default '0',
+  `dvb_wait_for_seqstart` int(11) NOT NULL default '1',
+  `skipbtaudio` tinyint(1) default '0',
+  `dvb_on_demand` tinyint(4) NOT NULL default '0',
+  `dvb_diseqc_type` smallint(6) default NULL,
+  `firewire_speed` int(10) unsigned NOT NULL default '0',
+  `firewire_model` varchar(32) default NULL,
+  `firewire_connection` int(10) unsigned NOT NULL default '0',
+  `dbox2_port` int(10) unsigned NOT NULL default '31338',
+  `dbox2_httpport` int(10) unsigned NOT NULL default '80',
+  `dbox2_host` varchar(32) default NULL,
+  `signal_timeout` int(11) NOT NULL default '1000',
+  `channel_timeout` int(11) NOT NULL default '3000',
+  `dvb_tuning_delay` int(10) unsigned NOT NULL default '0',
+  `contrast` int(11) NOT NULL default '0',
+  `brightness` int(11) NOT NULL default '0',
+  `colour` int(11) NOT NULL default '0',
+  `hue` int(11) NOT NULL default '0',
+  `diseqcid` int(10) unsigned default NULL,
+  `dvb_eitscan` tinyint(1) NOT NULL default '1',
+  PRIMARY KEY  (`cardid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `capturecard`
+--
+
+LOCK TABLES `capturecard` WRITE;
+/*!40000 ALTER TABLE `capturecard` DISABLE KEYS */;
+/*!40000 ALTER TABLE `capturecard` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `cardinput`
+--
+
+DROP TABLE IF EXISTS `cardinput`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `cardinput` (
+  `cardinputid` int(10) unsigned NOT NULL auto_increment,
+  `cardid` int(10) unsigned NOT NULL default '0',
+  `sourceid` int(10) unsigned NOT NULL default '0',
+  `inputname` varchar(32) NOT NULL default '',
+  `externalcommand` varchar(128) default NULL,
+  `shareable` char(1) default 'N',
+  `tunechan` varchar(10) default NULL,
+  `startchan` varchar(10) default NULL,
+  `freetoaironly` tinyint(1) default '1',
+  `displayname` varchar(64) NOT NULL default '',
+  `radioservices` tinyint(1) default '1',
+  `dishnet_eit` tinyint(1) NOT NULL default '0',
+  `recpriority` int(11) NOT NULL default '0',
+  `quicktune` tinyint(4) NOT NULL default '0',
+  PRIMARY KEY  (`cardinputid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `cardinput`
+--
+
+LOCK TABLES `cardinput` WRITE;
+/*!40000 ALTER TABLE `cardinput` DISABLE KEYS */;
+/*!40000 ALTER TABLE `cardinput` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `channel`
+--
+
+DROP TABLE IF EXISTS `channel`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `channel` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `channum` varchar(10) NOT NULL default '',
+  `freqid` varchar(10) default NULL,
+  `sourceid` int(10) unsigned default NULL,
+  `callsign` varchar(20) NOT NULL default '',
+  `name` varchar(64) NOT NULL default '',
+  `icon` varchar(255) NOT NULL default 'none',
+  `finetune` int(11) default NULL,
+  `videofilters` varchar(255) NOT NULL default '',
+  `xmltvid` varchar(64) NOT NULL default '',
+  `recpriority` int(10) NOT NULL default '0',
+  `contrast` int(11) default '32768',
+  `brightness` int(11) default '32768',
+  `colour` int(11) default '32768',
+  `hue` int(11) default '32768',
+  `tvformat` varchar(10) NOT NULL default 'Default',
+  `visible` tinyint(1) NOT NULL default '1',
+  `outputfilters` varchar(255) NOT NULL default '',
+  `useonairguide` tinyint(1) default '0',
+  `mplexid` smallint(6) default NULL,
+  `serviceid` mediumint(8) unsigned default NULL,
+  `tmoffset` int(11) NOT NULL default '0',
+  `atsc_major_chan` int(10) unsigned NOT NULL default '0',
+  `atsc_minor_chan` int(10) unsigned NOT NULL default '0',
+  `last_record` datetime NOT NULL,
+  `default_authority` varchar(32) NOT NULL default '',
+  `commmethod` int(11) NOT NULL default '-1',
+  PRIMARY KEY  (`chanid`),
+  KEY `channel_src` (`channum`,`sourceid`),
+  KEY `sourceid` (`sourceid`,`xmltvid`,`chanid`),
+  KEY `visible` (`visible`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `channel`
+--
+
+LOCK TABLES `channel` WRITE;
+/*!40000 ALTER TABLE `channel` DISABLE KEYS */;
+/*!40000 ALTER TABLE `channel` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `channelgroup`
+--
+
+DROP TABLE IF EXISTS `channelgroup`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `channelgroup` (
+  `id` int(10) unsigned NOT NULL auto_increment,
+  `chanid` int(11) unsigned NOT NULL default '0',
+  `grpid` int(11) NOT NULL default '1',
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `channelgroup`
+--
+
+LOCK TABLES `channelgroup` WRITE;
+/*!40000 ALTER TABLE `channelgroup` DISABLE KEYS */;
+/*!40000 ALTER TABLE `channelgroup` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `channelgroupnames`
+--
+
+DROP TABLE IF EXISTS `channelgroupnames`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `channelgroupnames` (
+  `grpid` int(10) unsigned NOT NULL auto_increment,
+  `name` varchar(64) NOT NULL default '0',
+  PRIMARY KEY  (`grpid`)
+) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `channelgroupnames`
+--
+
+LOCK TABLES `channelgroupnames` WRITE;
+/*!40000 ALTER TABLE `channelgroupnames` DISABLE KEYS */;
+INSERT INTO `channelgroupnames` (`grpid`, `name`) VALUES (1,'Favorites');
+/*!40000 ALTER TABLE `channelgroupnames` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `channelscan`
+--
+
+DROP TABLE IF EXISTS `channelscan`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `channelscan` (
+  `scanid` int(3) unsigned NOT NULL auto_increment,
+  `cardid` int(3) unsigned NOT NULL,
+  `sourceid` int(3) unsigned NOT NULL,
+  `processed` tinyint(1) unsigned NOT NULL,
+  `scandate` datetime NOT NULL,
+  PRIMARY KEY  (`scanid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `channelscan`
+--
+
+LOCK TABLES `channelscan` WRITE;
+/*!40000 ALTER TABLE `channelscan` DISABLE KEYS */;
+/*!40000 ALTER TABLE `channelscan` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `channelscan_channel`
+--
+
+DROP TABLE IF EXISTS `channelscan_channel`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `channelscan_channel` (
+  `transportid` int(6) unsigned NOT NULL,
+  `scanid` int(3) unsigned NOT NULL,
+  `mplex_id` smallint(6) NOT NULL,
+  `source_id` int(3) unsigned NOT NULL,
+  `channel_id` int(3) unsigned NOT NULL default '0',
+  `callsign` varchar(20) NOT NULL default '',
+  `service_name` varchar(64) NOT NULL default '',
+  `chan_num` varchar(10) NOT NULL default '',
+  `service_id` mediumint(8) unsigned NOT NULL default '0',
+  `atsc_major_channel` int(4) unsigned NOT NULL default '0',
+  `atsc_minor_channel` int(4) unsigned NOT NULL default '0',
+  `use_on_air_guide` tinyint(1) NOT NULL default '0',
+  `hidden` tinyint(1) NOT NULL default '0',
+  `hidden_in_guide` tinyint(1) NOT NULL default '0',
+  `freqid` varchar(10) NOT NULL default '',
+  `icon` varchar(255) NOT NULL default '',
+  `tvformat` varchar(10) NOT NULL default 'Default',
+  `xmltvid` varchar(64) NOT NULL default '',
+  `pat_tsid` int(5) unsigned NOT NULL default '0',
+  `vct_tsid` int(5) unsigned NOT NULL default '0',
+  `vct_chan_tsid` int(5) unsigned NOT NULL default '0',
+  `sdt_tsid` int(5) unsigned NOT NULL default '0',
+  `orig_netid` int(5) unsigned NOT NULL default '0',
+  `netid` int(5) unsigned NOT NULL default '0',
+  `si_standard` varchar(10) NOT NULL,
+  `in_channels_conf` tinyint(1) unsigned NOT NULL default '0',
+  `in_pat` tinyint(1) unsigned NOT NULL default '0',
+  `in_pmt` tinyint(1) unsigned NOT NULL default '0',
+  `in_vct` tinyint(1) unsigned NOT NULL default '0',
+  `in_nit` tinyint(1) unsigned NOT NULL default '0',
+  `in_sdt` tinyint(1) unsigned NOT NULL default '0',
+  `is_encrypted` tinyint(1) unsigned NOT NULL default '0',
+  `is_data_service` tinyint(1) unsigned NOT NULL default '0',
+  `is_audio_service` tinyint(1) unsigned NOT NULL default '0',
+  `is_opencable` tinyint(1) unsigned NOT NULL default '0',
+  `could_be_opencable` tinyint(1) unsigned NOT NULL default '0',
+  `decryption_status` smallint(2) unsigned NOT NULL default '0',
+  `default_authority` varchar(32) NOT NULL default ''
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `channelscan_channel`
+--
+
+LOCK TABLES `channelscan_channel` WRITE;
+/*!40000 ALTER TABLE `channelscan_channel` DISABLE KEYS */;
+/*!40000 ALTER TABLE `channelscan_channel` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `channelscan_dtv_multiplex`
+--
+
+DROP TABLE IF EXISTS `channelscan_dtv_multiplex`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `channelscan_dtv_multiplex` (
+  `transportid` int(6) unsigned NOT NULL auto_increment,
+  `scanid` int(3) unsigned NOT NULL,
+  `mplexid` smallint(6) unsigned NOT NULL,
+  `frequency` bigint(12) unsigned NOT NULL,
+  `inversion` char(1) NOT NULL default 'a',
+  `symbolrate` bigint(12) unsigned NOT NULL default '0',
+  `fec` varchar(10) NOT NULL default 'auto',
+  `polarity` char(1) NOT NULL default '',
+  `hp_code_rate` varchar(10) NOT NULL default 'auto',
+  `mod_sys` varchar(10) default NULL,
+  `rolloff` varchar(4) default NULL,
+  `lp_code_rate` varchar(10) NOT NULL default 'auto',
+  `modulation` varchar(10) NOT NULL default 'auto',
+  `transmission_mode` char(1) NOT NULL default 'a',
+  `guard_interval` varchar(10) NOT NULL default 'auto',
+  `hierarchy` varchar(10) NOT NULL default 'auto',
+  `bandwidth` char(1) NOT NULL default 'a',
+  `sistandard` varchar(10) NOT NULL,
+  `tuner_type` smallint(2) unsigned NOT NULL,
+  `default_authority` varchar(32) NOT NULL default '',
+  PRIMARY KEY  (`transportid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `channelscan_dtv_multiplex`
+--
+
+LOCK TABLES `channelscan_dtv_multiplex` WRITE;
+/*!40000 ALTER TABLE `channelscan_dtv_multiplex` DISABLE KEYS */;
+/*!40000 ALTER TABLE `channelscan_dtv_multiplex` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `codecparams`
+--
+
+DROP TABLE IF EXISTS `codecparams`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `codecparams` (
+  `profile` int(10) unsigned NOT NULL default '0',
+  `name` varchar(128) NOT NULL default '',
+  `value` varchar(128) default NULL,
+  PRIMARY KEY  (`profile`,`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `codecparams`
+--
+
+LOCK TABLES `codecparams` WRITE;
+/*!40000 ALTER TABLE `codecparams` DISABLE KEYS */;
+/*!40000 ALTER TABLE `codecparams` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `credits`
+--
+
+DROP TABLE IF EXISTS `credits`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `credits` (
+  `person` mediumint(8) unsigned NOT NULL default '0',
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `role` set('actor','director','producer','executive_producer','writer','guest_star','host','adapter','presenter','commentator','guest') character set latin1 NOT NULL default '',
+  UNIQUE KEY `chanid` (`chanid`,`starttime`,`person`,`role`),
+  KEY `person` (`person`,`role`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `credits`
+--
+
+LOCK TABLES `credits` WRITE;
+/*!40000 ALTER TABLE `credits` DISABLE KEYS */;
+/*!40000 ALTER TABLE `credits` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `customexample`
+--
+
+DROP TABLE IF EXISTS `customexample`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `customexample` (
+  `rulename` varchar(64) NOT NULL,
+  `fromclause` text NOT NULL,
+  `whereclause` text NOT NULL,
+  `search` tinyint(4) NOT NULL default '0',
+  PRIMARY KEY  (`rulename`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `customexample`
+--
+
+LOCK TABLES `customexample` WRITE;
+/*!40000 ALTER TABLE `customexample` DISABLE KEYS */;
+INSERT INTO `customexample` (`rulename`, `fromclause`, `whereclause`, `search`) VALUES ('New Flix','','program.category_type = \'movie\' AND program.airdate >= \n     YEAR(DATE_SUB(NOW(), INTERVAL 1 YEAR)) \nAND program.stars > 0.5 ',1);
+/*!40000 ALTER TABLE `customexample` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `diseqc_config`
+--
+
+DROP TABLE IF EXISTS `diseqc_config`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `diseqc_config` (
+  `cardinputid` int(10) unsigned NOT NULL,
+  `diseqcid` int(10) unsigned NOT NULL,
+  `value` varchar(16) NOT NULL default '',
+  KEY `id` (`cardinputid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `diseqc_config`
+--
+
+LOCK TABLES `diseqc_config` WRITE;
+/*!40000 ALTER TABLE `diseqc_config` DISABLE KEYS */;
+/*!40000 ALTER TABLE `diseqc_config` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `diseqc_tree`
+--
+
+DROP TABLE IF EXISTS `diseqc_tree`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `diseqc_tree` (
+  `diseqcid` int(10) unsigned NOT NULL auto_increment,
+  `parentid` int(10) unsigned default NULL,
+  `ordinal` tinyint(3) unsigned NOT NULL,
+  `type` varchar(16) NOT NULL default '',
+  `subtype` varchar(16) NOT NULL default '',
+  `description` varchar(32) NOT NULL default '',
+  `switch_ports` tinyint(3) unsigned NOT NULL default '0',
+  `rotor_hi_speed` float NOT NULL default '0',
+  `rotor_lo_speed` float NOT NULL default '0',
+  `rotor_positions` varchar(255) NOT NULL default '',
+  `lnb_lof_switch` int(10) NOT NULL default '0',
+  `lnb_lof_hi` int(10) NOT NULL default '0',
+  `lnb_lof_lo` int(10) NOT NULL default '0',
+  `cmd_repeat` int(11) NOT NULL default '1',
+  `lnb_pol_inv` tinyint(4) NOT NULL default '0',
+  `address` tinyint(3) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`diseqcid`),
+  KEY `parentid` (`parentid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `diseqc_tree`
+--
+
+LOCK TABLES `diseqc_tree` WRITE;
+/*!40000 ALTER TABLE `diseqc_tree` DISABLE KEYS */;
+/*!40000 ALTER TABLE `diseqc_tree` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `displayprofilegroups`
+--
+
+DROP TABLE IF EXISTS `displayprofilegroups`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `displayprofilegroups` (
+  `name` varchar(128) NOT NULL,
+  `hostname` varchar(64) NOT NULL,
+  `profilegroupid` int(10) unsigned NOT NULL auto_increment,
+  PRIMARY KEY  (`name`,`hostname`),
+  UNIQUE KEY `profilegroupid` (`profilegroupid`)
+) ENGINE=MyISAM AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `displayprofilegroups`
+--
+
+LOCK TABLES `displayprofilegroups` WRITE;
+/*!40000 ALTER TABLE `displayprofilegroups` DISABLE KEYS */;
+INSERT INTO `displayprofilegroups` (`name`, `hostname`, `profilegroupid`) VALUES ('CPU++','larch5',1),('CPU+','larch5',2),('CPU--','larch5',3),('High Quality','larch5',4),('Normal','larch5',5),('Slim','larch5',6),('VDPAU High Quality','larch5',7),('VDPAU Normal','larch5',8),('VDPAU Slim','larch5',9);
+/*!40000 ALTER TABLE `displayprofilegroups` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `displayprofiles`
+--
+
+DROP TABLE IF EXISTS `displayprofiles`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `displayprofiles` (
+  `profilegroupid` int(10) unsigned NOT NULL,
+  `profileid` int(10) unsigned NOT NULL auto_increment,
+  `value` varchar(128) NOT NULL,
+  `data` varchar(255) NOT NULL default '',
+  KEY `profilegroupid` (`profilegroupid`),
+  KEY `profileid` (`profileid`,`value`),
+  KEY `profileid_2` (`profileid`)
+) ENGINE=MyISAM AUTO_INCREMENT=29 DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `displayprofiles`
+--
+
+LOCK TABLES `displayprofiles` WRITE;
+/*!40000 ALTER TABLE `displayprofiles` DISABLE KEYS */;
+INSERT INTO `displayprofiles` (`profilegroupid`, `profileid`, `value`, `data`) VALUES (1,1,'pref_priority','1'),(1,1,'pref_cmp0','> 0 0'),(1,1,'pref_decoder','ffmpeg'),(1,1,'pref_max_cpus','1'),(1,1,'pref_videorenderer','xv-blit'),(1,1,'pref_osdrenderer','softblend'),(1,1,'pref_osdfade','1'),(1,1,'pref_deint0','bobdeint'),(1,1,'pref_deint1','linearblend'),(1,1,'pref_filters',''),(1,2,'pref_priority','2'),(1,2,'pref_cmp0','> 0 0'),(1,2,'pref_decoder','ffmpeg'),(1,2,'pref_max_cpus','1'),(1,2,'pref_videorenderer','quartz-blit'),(1,2,'pref_osdrenderer','softblend'),(1,2,'pref_osdfade','1'),(1,2,'pref_deint0','linearblend'),(1,2,'pref_deint1','linearblend'),(1,2,'pref_filters',''),(2,3,'pref_priority','1'),(2,3,'pref_cmp0','<= 720 576'),(2,3,'pref_cmp1','> 0 0'),(2,3,'pref_decoder','ffmpeg'),(2,3,'pref_max_cpus','1'),(2,3,'pref_videorenderer','xv-blit'),(2,3,'pref_osdrenderer','softblend'),(2,3,'pref_osdfade','1'),(2,3,'pref_deint0','bobdeint'),(2,3,'pref_deint1','linearblend'),(2,3,'pref_filters',''),(2,4,'pref_priority','2'),(2,4,'pref_cmp0','<= 1280 720'),(2,4,'pref_cmp1','> 720 576'),(2,4,'pref_decoder','xvmc'),(2,4,'pref_max_cpus','1'),(2,4,'pref_videorenderer','xvmc-blit'),(2,4,'pref_osdrenderer','opengl'),(2,4,'pref_osdfade','1'),(2,4,'pref_deint0','bobdeint'),(2,4,'pref_deint1','onefield'),(2,4,'pref_filters',''),(2,5,'pref_priority','3'),(2,5,'pref_cmp0','<= 1280 720'),(2,5,'pref_cmp1','> 720 576'),(2,5,'pref_decoder','libmpeg2'),(2,5,'pref_max_cpus','1'),(2,5,'pref_videorenderer','xv-blit'),(2,5,'pref_osdrenderer','softblend'),(2,5,'pref_osdfade','1'),(2,5,'pref_deint0','bobdeint'),(2,5,'pref_deint1','onefield'),(2,5,'pref_filters',''),(2,6,'pref_priority','4'),(2,6,'pref_cmp0','> 0 0'),(2,6,'pref_decoder','xvmc'),(2,6,'pref_max_cpus','1'),(2,6,'pref_videorenderer','xvmc-blit'),(2,6,'pref_osdrenderer','ia44blend'),(2,6,'pref_osdfade','0'),(2,6,'pref_deint0','bobdeint'),(2,6,'pref_deint1','onefield'),(2,6,'pref_filters',''),(2,7,'pref_priority','5'),(2,7,'pref_cmp0','> 0 0'),(2,7,'pref_decoder','libmpeg2'),(2,7,'pref_max_cpus','1'),(2,7,'pref_videorenderer','xv-blit'),(2,7,'pref_osdrenderer','chromakey'),(2,7,'pref_osdfade','0'),(2,7,'pref_deint0','bobdeint'),(2,7,'pref_deint1','onefield'),(2,7,'pref_filters',''),(3,8,'pref_priority','1'),(3,8,'pref_cmp0','<= 720 576'),(3,8,'pref_cmp1','> 0 0'),(3,8,'pref_decoder','ivtv'),(3,8,'pref_max_cpus','1'),(3,8,'pref_videorenderer','ivtv'),(3,8,'pref_osdrenderer','ivtv'),(3,8,'pref_osdfade','1'),(3,8,'pref_deint0','none'),(3,8,'pref_deint1','none'),(3,8,'pref_filters',''),(3,9,'pref_priority','2'),(3,9,'pref_cmp0','<= 720 576'),(3,9,'pref_cmp1','> 0 0'),(3,9,'pref_decoder','xvmc'),(3,9,'pref_max_cpus','1'),(3,9,'pref_videorenderer','xvmc-blit'),(3,9,'pref_osdrenderer','ia44blend'),(3,9,'pref_osdfade','0'),(3,9,'pref_deint0','bobdeint'),(3,9,'pref_deint1','onefield'),(3,9,'pref_filters',''),(3,10,'pref_priority','3'),(3,10,'pref_cmp0','<= 1280 720'),(3,10,'pref_cmp1','> 720 576'),(3,10,'pref_decoder','xvmc'),(3,10,'pref_max_cpus','1'),(3,10,'pref_videorenderer','xvmc-blit'),(3,10,'pref_osdrenderer','ia44blend'),(3,10,'pref_osdfade','0'),(3,10,'pref_deint0','bobdeint'),(3,10,'pref_deint1','onefield'),(3,10,'pref_filters',''),(3,11,'pref_priority','4'),(3,11,'pref_cmp0','> 0 0'),(3,11,'pref_decoder','xvmc'),(3,11,'pref_max_cpus','1'),(3,11,'pref_videorenderer','xvmc-blit'),(3,11,'pref_osdrenderer','ia44blend'),(3,11,'pref_osdfade','0'),(3,11,'pref_deint0','bobdeint'),(3,11,'pref_deint1','onefield'),(3,11,'pref_filters',''),(3,12,'pref_priority','5'),(3,12,'pref_cmp0','> 0 0'),(3,12,'pref_decoder','libmpeg2'),(3,12,'pref_max_cpus','1'),(3,12,'pref_videorenderer','xv-blit'),(3,12,'pref_osdrenderer','chromakey'),(3,12,'pref_osdfade','0'),(3,12,'pref_deint0','none'),(3,12,'pref_deint1','none'),(3,12,'pref_filters',''),(4,13,'pref_priority','1'),(4,13,'pref_cmp0','>= 1920 1080'),(4,13,'pref_decoder','ffmpeg'),(4,13,'pref_max_cpus','2'),(4,13,'pref_videorenderer','xv-blit'),(4,13,'pref_osdrenderer','softblend'),(4,13,'pref_osdfade','1'),(4,13,'pref_deint0','linearblend'),(4,13,'pref_deint1','linearblend'),(4,13,'pref_filters',''),(4,14,'pref_priority','2'),(4,14,'pref_cmp0','> 0 0'),(4,14,'pref_decoder','ffmpeg'),(4,14,'pref_max_cpus','1'),(4,14,'pref_videorenderer','xv-blit'),(4,14,'pref_osdrenderer','softblend'),(4,14,'pref_osdfade','1'),(4,14,'pref_deint0','yadifdoubleprocessdeint'),(4,14,'pref_deint1','yadifdeint'),(4,14,'pref_filters',''),(4,15,'pref_priority','3'),(4,15,'pref_cmp0','>= 1920 1080'),(4,15,'pref_decoder','ffmpeg'),(4,15,'pref_max_cpus','2'),(4,15,'pref_videorenderer','quartz-blit'),(4,15,'pref_osdrenderer','softblend'),(4,15,'pref_osdfade','1'),(4,15,'pref_deint0','linearblend'),(4,15,'pref_deint1','linearblend'),(4,15,'pref_filters',''),(4,16,'pref_priority','4'),(4,16,'pref_cmp0','> 0 0'),(4,16,'pref_decoder','ffmpeg'),(4,16,'pref_max_cpus','1'),(4,16,'pref_videorenderer','quartz-blit'),(4,16,'pref_osdrenderer','softblend'),(4,16,'pref_osdfade','1'),(4,16,'pref_deint0','yadifdoubleprocessdeint'),(4,16,'pref_deint1','yadifdeint'),(4,16,'pref_filters',''),(5,17,'pref_priority','1'),(5,17,'pref_cmp0','>= 1280 720'),(5,17,'pref_decoder','ffmpeg'),(5,17,'pref_max_cpus','1'),(5,17,'pref_videorenderer','xv-blit'),(5,17,'pref_osdrenderer','softblend'),(5,17,'pref_osdfade','0'),(5,17,'pref_deint0','linearblend'),(5,17,'pref_deint1','linearblend'),(5,17,'pref_filters',''),(5,18,'pref_priority','2'),(5,18,'pref_cmp0','> 0 0'),(5,18,'pref_decoder','ffmpeg'),(5,18,'pref_max_cpus','1'),(5,18,'pref_videorenderer','xv-blit'),(5,18,'pref_osdrenderer','softblend'),(5,18,'pref_osdfade','1'),(5,18,'pref_deint0','greedyhdoubleprocessdeint'),(5,18,'pref_deint1','kerneldeint'),(5,18,'pref_filters',''),(5,19,'pref_priority','3'),(5,19,'pref_cmp0','>= 1280 720'),(5,19,'pref_decoder','ffmpeg'),(5,19,'pref_max_cpus','1'),(5,19,'pref_videorenderer','quartz-blit'),(5,19,'pref_osdrenderer','softblend'),(5,19,'pref_osdfade','0'),(5,19,'pref_deint0','linearblend'),(5,19,'pref_deint1','linearblend'),(5,19,'pref_filters',''),(5,20,'pref_priority','4'),(5,20,'pref_cmp0','> 0 0'),(5,20,'pref_decoder','ffmpeg'),(5,20,'pref_max_cpus','1'),(5,20,'pref_videorenderer','quartz-blit'),(5,20,'pref_osdrenderer','softblend'),(5,20,'pref_osdfade','1'),(5,20,'pref_deint0','greedyhdoubleprocessdeint'),(5,20,'pref_deint1','kerneldeint'),(5,20,'pref_filters',''),(6,21,'pref_priority','1'),(6,21,'pref_cmp0','>= 1280 720'),(6,21,'pref_decoder','ffmpeg'),(6,21,'pref_max_cpus','1'),(6,21,'pref_videorenderer','xv-blit'),(6,21,'pref_osdrenderer','softblend'),(6,21,'pref_osdfade','0'),(6,21,'pref_deint0','onefield'),(6,21,'pref_deint1','onefield'),(6,21,'pref_filters',''),(6,22,'pref_priority','2'),(6,22,'pref_cmp0','> 0 0'),(6,22,'pref_decoder','ffmpeg'),(6,22,'pref_max_cpus','1'),(6,22,'pref_videorenderer','xv-blit'),(6,22,'pref_osdrenderer','softblend'),(6,22,'pref_osdfade','1'),(6,22,'pref_deint0','linearblend'),(6,22,'pref_deint1','linearblend'),(6,22,'pref_filters',''),(6,23,'pref_priority','3'),(6,23,'pref_cmp0','>= 1280 720'),(6,23,'pref_decoder','ffmpeg'),(6,23,'pref_max_cpus','1'),(6,23,'pref_videorenderer','quartz-blit'),(6,23,'pref_osdrenderer','softblend'),(6,23,'pref_osdfade','0'),(6,23,'pref_deint0','onefield'),(6,23,'pref_deint1','onefield'),(6,23,'pref_filters',''),(6,24,'pref_priority','4'),(6,24,'pref_cmp0','> 0 0'),(6,24,'pref_decoder','ffmpeg'),(6,24,'pref_max_cpus','1'),(6,24,'pref_videorenderer','quartz-blit'),(6,24,'pref_osdrenderer','softblend'),(6,24,'pref_osdfade','1'),(6,24,'pref_deint0','linearblend'),(6,24,'pref_deint1','linearblend'),(6,24,'pref_filters',''),(7,25,'pref_priority','1'),(7,25,'pref_cmp0','> 0 0'),(7,25,'pref_decoder','vdpau'),(7,25,'pref_max_cpus','1'),(7,25,'pref_videorenderer','vdpau'),(7,25,'pref_osdrenderer','vdpau'),(7,25,'pref_osdfade','1'),(7,25,'pref_deint0','vdpauadvanceddoublerate'),(7,25,'pref_deint1','vdpauadvanced'),(7,25,'pref_filters',''),(8,26,'pref_priority','1'),(8,26,'pref_cmp0','>= 0 720'),(8,26,'pref_decoder','vdpau'),(8,26,'pref_max_cpus','1'),(8,26,'pref_videorenderer','vdpau'),(8,26,'pref_osdrenderer','vdpau'),(8,26,'pref_osdfade','1'),(8,26,'pref_deint0','vdpaubasicdoublerate'),(8,26,'pref_deint1','vdpaubasic'),(8,26,'pref_filters',''),(8,27,'pref_priority','2'),(8,27,'pref_cmp0','> 0 0'),(8,27,'pref_decoder','vdpau'),(8,27,'pref_max_cpus','1'),(8,27,'pref_videorenderer','vdpau'),(8,27,'pref_osdrenderer','vdpau'),(8,27,'pref_osdfade','1'),(8,27,'pref_deint0','vdpauadvanceddoublerate'),(8,27,'pref_deint1','vdpauadvanced'),(8,27,'pref_filters',''),(9,28,'pref_priority','1'),(9,28,'pref_cmp0','> 0 0'),(9,28,'pref_decoder','vdpau'),(9,28,'pref_max_cpus','1'),(9,28,'pref_videorenderer','vdpau'),(9,28,'pref_osdrenderer','vdpau'),(9,28,'pref_osdfade','0'),(9,28,'pref_deint0','vdpaubobdeint'),(9,28,'pref_deint1','vdpauonefield'),(9,28,'pref_filters','vdpauskipchroma');
+/*!40000 ALTER TABLE `displayprofiles` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `dtv_multiplex`
+--
+
+DROP TABLE IF EXISTS `dtv_multiplex`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `dtv_multiplex` (
+  `mplexid` smallint(6) NOT NULL auto_increment,
+  `sourceid` smallint(6) default NULL,
+  `transportid` int(11) default NULL,
+  `networkid` int(11) default NULL,
+  `frequency` int(11) default NULL,
+  `inversion` char(1) default 'a',
+  `symbolrate` int(11) default NULL,
+  `fec` varchar(10) default 'auto',
+  `polarity` char(1) default NULL,
+  `modulation` varchar(10) default 'auto',
+  `bandwidth` char(1) default 'a',
+  `lp_code_rate` varchar(10) default 'auto',
+  `transmission_mode` char(1) default 'a',
+  `guard_interval` varchar(10) default 'auto',
+  `visible` smallint(1) NOT NULL default '0',
+  `constellation` varchar(10) default 'auto',
+  `hierarchy` varchar(10) default 'auto',
+  `hp_code_rate` varchar(10) default 'auto',
+  `mod_sys` varchar(10) default NULL,
+  `rolloff` varchar(4) default NULL,
+  `sistandard` varchar(10) default 'dvb',
+  `serviceversion` smallint(6) default '33',
+  `updatetimestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  `default_authority` varchar(32) NOT NULL default '',
+  PRIMARY KEY  (`mplexid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `dtv_multiplex`
+--
+
+LOCK TABLES `dtv_multiplex` WRITE;
+/*!40000 ALTER TABLE `dtv_multiplex` DISABLE KEYS */;
+/*!40000 ALTER TABLE `dtv_multiplex` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `dtv_privatetypes`
+--
+
+DROP TABLE IF EXISTS `dtv_privatetypes`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `dtv_privatetypes` (
+  `sitype` varchar(4) NOT NULL default '',
+  `networkid` int(11) NOT NULL default '0',
+  `private_type` varchar(20) NOT NULL default '',
+  `private_value` varchar(100) NOT NULL default ''
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `dtv_privatetypes`
+--
+
+LOCK TABLES `dtv_privatetypes` WRITE;
+/*!40000 ALTER TABLE `dtv_privatetypes` DISABLE KEYS */;
+INSERT INTO `dtv_privatetypes` (`sitype`, `networkid`, `private_type`, `private_value`) VALUES ('dvb',9018,'channel_numbers','131'),('dvb',9018,'guide_fixup','2'),('dvb',256,'guide_fixup','1'),('dvb',257,'guide_fixup','1'),('dvb',256,'tv_types','1,150,134,133'),('dvb',257,'tv_types','1,150,134,133'),('dvb',4100,'sdt_mapping','1'),('dvb',4101,'sdt_mapping','1'),('dvb',4102,'sdt_mapping','1'),('dvb',4103,'sdt_mapping','1'),('dvb',4104,'sdt_mapping','1'),('dvb',4105,'sdt_mapping','1'),('dvb',4106,'sdt_mapping','1'),('dvb',4107,'sdt_mapping','1'),('dvb',4097,'sdt_mapping','1'),('dvb',4098,'sdt_mapping','1'),('dvb',4100,'tv_types','1,145,154'),('dvb',4101,'tv_types','1,145,154'),('dvb',4102,'tv_types','1,145,154'),('dvb',4103,'tv_types','1,145,154'),('dvb',4104,'tv_types','1,145,154'),('dvb',4105,'tv_types','1,145,154'),('dvb',4106,'tv_types','1,145,154'),('dvb',4107,'tv_types','1,145,154'),('dvb',4097,'tv_types','1,145,154'),('dvb',4098,'tv_types','1,145,154'),('dvb',4100,'guide_fixup','1'),('dvb',4101,'guide_fixup','1'),('dvb',4102,'guide_fixup','1'),('dvb',4103,'guide_fixup','1'),('dvb',4104,'guide_fixup','1'),('dvb',4105,'guide_fixup','1'),('dvb',4106,'guide_fixup','1'),('dvb',4107,'guide_fixup','1'),('dvb',4096,'guide_fixup','5'),('dvb',4097,'guide_fixup','1'),('dvb',4098,'guide_fixup','1'),('dvb',94,'tv_types','1,128'),('atsc',1793,'guide_fixup','3'),('dvb',40999,'guide_fixup','4'),('dvb',70,'force_guide_present','yes'),('dvb',70,'guide_ranges','80,80,96,96'),('dvb',4112,'channel_numbers','131'),('dvb',4115,'channel_numbers','131'),('dvb',4116,'channel_numbers','131'),('dvb',12802,'channel_numbers','131'),('dvb',12803,'channel_numbers','131'),('dvb',12829,'channel_numbers','131'),('dvb',40999,'parse_subtitle_list','1070,1308,1041,1306,1307,1030,1016,1131,1068,1069'),('dvb',4096,'guide_fixup','5');
+/*!40000 ALTER TABLE `dtv_privatetypes` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `dvdbookmark`
+--
+
+DROP TABLE IF EXISTS `dvdbookmark`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `dvdbookmark` (
+  `serialid` varchar(16) NOT NULL default '',
+  `name` varchar(32) default NULL,
+  `title` smallint(6) NOT NULL default '0',
+  `audionum` tinyint(4) NOT NULL default '-1',
+  `subtitlenum` tinyint(4) NOT NULL default '-1',
+  `framenum` bigint(20) NOT NULL default '0',
+  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  PRIMARY KEY  (`serialid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `dvdbookmark`
+--
+
+LOCK TABLES `dvdbookmark` WRITE;
+/*!40000 ALTER TABLE `dvdbookmark` DISABLE KEYS */;
+/*!40000 ALTER TABLE `dvdbookmark` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `dvdinput`
+--
+
+DROP TABLE IF EXISTS `dvdinput`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `dvdinput` (
+  `intid` int(10) unsigned NOT NULL,
+  `hsize` int(10) unsigned default NULL,
+  `vsize` int(10) unsigned default NULL,
+  `ar_num` int(10) unsigned default NULL,
+  `ar_denom` int(10) unsigned default NULL,
+  `fr_code` int(10) unsigned default NULL,
+  `letterbox` tinyint(1) default NULL,
+  `v_format` varchar(16) default NULL,
+  PRIMARY KEY  (`intid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `dvdinput`
+--
+
+LOCK TABLES `dvdinput` WRITE;
+/*!40000 ALTER TABLE `dvdinput` DISABLE KEYS */;
+INSERT INTO `dvdinput` (`intid`, `hsize`, `vsize`, `ar_num`, `ar_denom`, `fr_code`, `letterbox`, `v_format`) VALUES (1,720,480,16,9,1,1,'ntsc'),(2,720,480,16,9,1,0,'ntsc'),(3,720,480,4,3,1,1,'ntsc'),(4,720,480,4,3,1,0,'ntsc'),(5,720,576,16,9,3,1,'pal'),(6,720,576,16,9,3,0,'pal'),(7,720,576,4,3,3,1,'pal'),(8,720,576,4,3,3,0,'pal');
+/*!40000 ALTER TABLE `dvdinput` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `dvdtranscode`
+--
+
+DROP TABLE IF EXISTS `dvdtranscode`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `dvdtranscode` (
+  `intid` int(11) NOT NULL auto_increment,
+  `input` int(10) unsigned default NULL,
+  `name` varchar(128) NOT NULL,
+  `sync_mode` int(10) unsigned default NULL,
+  `use_yv12` tinyint(1) default NULL,
+  `cliptop` int(11) default NULL,
+  `clipbottom` int(11) default NULL,
+  `clipleft` int(11) default NULL,
+  `clipright` int(11) default NULL,
+  `f_resize_h` int(11) default NULL,
+  `f_resize_w` int(11) default NULL,
+  `hq_resize_h` int(11) default NULL,
+  `hq_resize_w` int(11) default NULL,
+  `grow_h` int(11) default NULL,
+  `grow_w` int(11) default NULL,
+  `clip2top` int(11) default NULL,
+  `clip2bottom` int(11) default NULL,
+  `clip2left` int(11) default NULL,
+  `clip2right` int(11) default NULL,
+  `codec` varchar(128) NOT NULL,
+  `codec_param` varchar(128) default NULL,
+  `bitrate` int(11) default NULL,
+  `a_sample_r` int(11) default NULL,
+  `a_bitrate` int(11) default NULL,
+  `two_pass` tinyint(1) default NULL,
+  `tc_param` varchar(128) default NULL,
+  PRIMARY KEY  (`intid`)
+) ENGINE=MyISAM AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `dvdtranscode`
+--
+
+LOCK TABLES `dvdtranscode` WRITE;
+/*!40000 ALTER TABLE `dvdtranscode` DISABLE KEYS */;
+INSERT INTO `dvdtranscode` (`intid`, `input`, `name`, `sync_mode`, `use_yv12`, `cliptop`, `clipbottom`, `clipleft`, `clipright`, `f_resize_h`, `f_resize_w`, `hq_resize_h`, `hq_resize_w`, `grow_h`, `grow_w`, `clip2top`, `clip2bottom`, `clip2left`, `clip2right`, `codec`, `codec_param`, `bitrate`, `a_sample_r`, `a_bitrate`, `two_pass`, `tc_param`) VALUES (1,1,'Good',2,1,16,16,0,0,2,0,0,0,0,0,32,32,8,8,'divx5',NULL,1618,NULL,NULL,0,NULL),(2,2,'Excellent',2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'divx5',NULL,0,NULL,NULL,1,NULL),(3,2,'Good',2,1,0,0,8,8,0,0,0,0,0,0,0,0,0,0,'divx5',NULL,1618,NULL,NULL,0,NULL),(4,2,'Medium',2,1,0,0,8,8,5,5,0,0,0,0,0,0,0,0,'divx5',NULL,1200,NULL,NULL,0,NULL),(5,3,'Good',2,1,0,0,0,0,0,0,0,0,2,0,80,80,8,8,'divx5',NULL,0,NULL,NULL,0,NULL),(6,4,'Excellent',2,1,0,0,0,0,0,0,0,0,2,0,0,0,0,0,'divx5',NULL,0,NULL,NULL,1,NULL),(7,4,'Good',2,1,0,0,8,8,0,2,0,0,0,0,0,0,0,0,'divx5',NULL,1618,NULL,NULL,0,NULL),(8,5,'Good',1,1,16,16,0,0,5,0,0,0,0,0,40,40,8,8,'divx5',NULL,1618,NULL,NULL,0,NULL),(9,6,'Good',1,1,0,0,16,16,5,0,0,0,0,0,0,0,0,0,'divx5',NULL,1618,NULL,NULL,0,NULL),(10,7,'Good',1,1,0,0,0,0,1,0,0,0,0,0,76,76,8,8,'divx5',NULL,1618,NULL,NULL,0,NULL),(11,8,'Good',1,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,'divx5',NULL,1618,NULL,NULL,0,NULL);
+/*!40000 ALTER TABLE `dvdtranscode` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `eit_cache`
+--
+
+DROP TABLE IF EXISTS `eit_cache`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `eit_cache` (
+  `chanid` int(10) NOT NULL,
+  `eventid` int(10) unsigned NOT NULL default '0',
+  `tableid` tinyint(3) unsigned NOT NULL,
+  `version` tinyint(3) unsigned NOT NULL,
+  `endtime` int(10) unsigned NOT NULL,
+  `status` tinyint(4) NOT NULL default '0',
+  PRIMARY KEY  (`chanid`,`eventid`,`status`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `eit_cache`
+--
+
+LOCK TABLES `eit_cache` WRITE;
+/*!40000 ALTER TABLE `eit_cache` DISABLE KEYS */;
+/*!40000 ALTER TABLE `eit_cache` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `filemarkup`
+--
+
+DROP TABLE IF EXISTS `filemarkup`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `filemarkup` (
+  `filename` text NOT NULL,
+  `mark` mediumint(8) unsigned NOT NULL default '0',
+  `offset` bigint(20) unsigned default NULL,
+  `type` tinyint(4) NOT NULL default '0',
+  KEY `filename` (`filename`(255))
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `filemarkup`
+--
+
+LOCK TABLES `filemarkup` WRITE;
+/*!40000 ALTER TABLE `filemarkup` DISABLE KEYS */;
+/*!40000 ALTER TABLE `filemarkup` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `gallerymetadata`
+--
+
+DROP TABLE IF EXISTS `gallerymetadata`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `gallerymetadata` (
+  `image` varchar(255) character set utf8 collate utf8_bin NOT NULL,
+  `angle` int(11) NOT NULL,
+  PRIMARY KEY  (`image`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `gallerymetadata`
+--
+
+LOCK TABLES `gallerymetadata` WRITE;
+/*!40000 ALTER TABLE `gallerymetadata` DISABLE KEYS */;
+/*!40000 ALTER TABLE `gallerymetadata` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `gamemetadata`
+--
+
+DROP TABLE IF EXISTS `gamemetadata`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `gamemetadata` (
+  `system` varchar(128) NOT NULL default '',
+  `romname` varchar(128) NOT NULL default '',
+  `gamename` varchar(128) NOT NULL default '',
+  `genre` varchar(128) NOT NULL default '',
+  `year` varchar(10) NOT NULL default '',
+  `publisher` varchar(128) NOT NULL default '',
+  `favorite` tinyint(1) default NULL,
+  `rompath` varchar(255) NOT NULL default '',
+  `screenshot` varchar(255) NOT NULL,
+  `fanart` varchar(255) NOT NULL,
+  `plot` text NOT NULL,
+  `boxart` varchar(255) NOT NULL,
+  `gametype` varchar(64) NOT NULL default '',
+  `diskcount` tinyint(1) NOT NULL default '1',
+  `country` varchar(128) NOT NULL default '',
+  `crc_value` varchar(64) NOT NULL default '',
+  `display` tinyint(1) NOT NULL default '1',
+  `version` varchar(64) NOT NULL default '',
+  KEY `system` (`system`),
+  KEY `year` (`year`),
+  KEY `romname` (`romname`),
+  KEY `gamename` (`gamename`),
+  KEY `genre` (`genre`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `gamemetadata`
+--
+
+LOCK TABLES `gamemetadata` WRITE;
+/*!40000 ALTER TABLE `gamemetadata` DISABLE KEYS */;
+/*!40000 ALTER TABLE `gamemetadata` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `gameplayers`
+--
+
+DROP TABLE IF EXISTS `gameplayers`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `gameplayers` (
+  `gameplayerid` int(10) unsigned NOT NULL auto_increment,
+  `playername` varchar(64) NOT NULL default '',
+  `workingpath` varchar(255) NOT NULL default '',
+  `rompath` varchar(255) NOT NULL default '',
+  `screenshots` varchar(255) NOT NULL default '',
+  `commandline` text NOT NULL,
+  `gametype` varchar(64) NOT NULL default '',
+  `extensions` varchar(128) NOT NULL default '',
+  `spandisks` tinyint(1) NOT NULL default '0',
+  PRIMARY KEY  (`gameplayerid`),
+  UNIQUE KEY `playername` (`playername`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `gameplayers`
+--
+
+LOCK TABLES `gameplayers` WRITE;
+/*!40000 ALTER TABLE `gameplayers` DISABLE KEYS */;
+/*!40000 ALTER TABLE `gameplayers` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `housekeeping`
+--
+
+DROP TABLE IF EXISTS `housekeeping`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `housekeeping` (
+  `tag` varchar(64) NOT NULL default '',
+  `lastrun` datetime default NULL,
+  PRIMARY KEY  (`tag`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `housekeeping`
+--
+
+LOCK TABLES `housekeeping` WRITE;
+/*!40000 ALTER TABLE `housekeeping` DISABLE KEYS */;
+INSERT INTO `housekeeping` (`tag`, `lastrun`) VALUES ('BackupDB','2010-01-18 05:29:21');
+/*!40000 ALTER TABLE `housekeeping` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `inputgroup`
+--
+
+DROP TABLE IF EXISTS `inputgroup`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `inputgroup` (
+  `cardinputid` int(10) unsigned NOT NULL,
+  `inputgroupid` int(10) unsigned NOT NULL,
+  `inputgroupname` varchar(32) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `inputgroup`
+--
+
+LOCK TABLES `inputgroup` WRITE;
+/*!40000 ALTER TABLE `inputgroup` DISABLE KEYS */;
+/*!40000 ALTER TABLE `inputgroup` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `inuseprograms`
+--
+
+DROP TABLE IF EXISTS `inuseprograms`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `inuseprograms` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `recusage` varchar(128) NOT NULL default '',
+  `lastupdatetime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `hostname` varchar(64) NOT NULL default '',
+  `rechost` varchar(64) NOT NULL,
+  `recdir` varchar(255) NOT NULL default '',
+  KEY `chanid` (`chanid`,`starttime`),
+  KEY `recusage` (`recusage`,`lastupdatetime`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `inuseprograms`
+--
+
+LOCK TABLES `inuseprograms` WRITE;
+/*!40000 ALTER TABLE `inuseprograms` DISABLE KEYS */;
+/*!40000 ALTER TABLE `inuseprograms` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `jobqueue`
+--
+
+DROP TABLE IF EXISTS `jobqueue`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `jobqueue` (
+  `id` int(11) NOT NULL auto_increment,
+  `chanid` int(10) NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `inserttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `type` int(11) NOT NULL default '0',
+  `cmds` int(11) NOT NULL default '0',
+  `flags` int(11) NOT NULL default '0',
+  `status` int(11) NOT NULL default '0',
+  `statustime` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  `hostname` varchar(64) NOT NULL default '',
+  `args` blob NOT NULL,
+  `comment` varchar(128) NOT NULL default '',
+  `schedruntime` datetime NOT NULL default '2007-01-01 00:00:00',
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `chanid` (`chanid`,`starttime`,`type`,`inserttime`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `jobqueue`
+--
+
+LOCK TABLES `jobqueue` WRITE;
+/*!40000 ALTER TABLE `jobqueue` DISABLE KEYS */;
+/*!40000 ALTER TABLE `jobqueue` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `jumppoints`
+--
+
+DROP TABLE IF EXISTS `jumppoints`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `jumppoints` (
+  `destination` varchar(128) NOT NULL default '',
+  `description` varchar(255) default NULL,
+  `keylist` varchar(128) default NULL,
+  `hostname` varchar(64) NOT NULL default '',
+  PRIMARY KEY  (`destination`,`hostname`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `jumppoints`
+--
+
+LOCK TABLES `jumppoints` WRITE;
+/*!40000 ALTER TABLE `jumppoints` DISABLE KEYS */;
+INSERT INTO `jumppoints` (`destination`, `description`, `keylist`, `hostname`) VALUES ('Reload Theme','','','larch5'),('Main Menu','','','larch5'),('Program Guide','','','larch5'),('Program Finder','','','larch5'),('Manage Recordings / Fix Conflicts','','','larch5'),('Program Recording Priorities','','','larch5'),('Channel Recording Priorities','','','larch5'),('TV Recording Playback','','','larch5'),('TV Recording Deletion','','','larch5'),('Live TV','','','larch5'),('Live TV In Guide','','','larch5'),('Manual Record Scheduling','','','larch5'),('Status Screen','','','larch5'),('Previously Recorded','','','larch5'),('Netflix Browser','Browse Netflix titles','','larch5'),('Netflix Queue','Administer Netflix Queue','','larch5'),('Netflix History','View Netflix History','','larch5'),('MythGallery','Image viewer / slideshow','','larch5'),('MythGame','Game frontend','','larch5'),('Play music','','','larch5'),('Select music playlists','','','larch5'),('Rip CD','','','larch5'),('Scan music','','','larch5'),('Show Music Miniplayer','','','larch5'),('MythNews','RSS News feed reader','','larch5'),('MythVideo','The MythVideo default view','','larch5'),('Video Manager','The MythVideo video manager','','larch5'),('Video Browser','The MythVideo video browser','','larch5'),('Video Listings','The MythVideo video listings','','larch5'),('Video Gallery','The MythVideo video gallery','','larch5'),('Play DVD','Play a DVD','','larch5'),('Play VCD','Play a VCD','','larch5'),('Rip DVD','Import a DVD into your MythVideo database','','larch5'),('MythWeather','Weather forecasts','','larch5'),('Manage Recording Rules','','','larch5'),('ScreenShot','','','larch5'),('Create DVD','','','larch5'),('Create Archive','','','larch5'),('Import Archive','','','larch5'),('View Archive Log','','','larch5'),('Play Created DVD','','','larch5'),('Burn DVD','','','larch5');
+/*!40000 ALTER TABLE `jumppoints` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `keybindings`
+--
+
+DROP TABLE IF EXISTS `keybindings`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `keybindings` (
+  `context` varchar(32) NOT NULL default '',
+  `action` varchar(32) NOT NULL default '',
+  `description` varchar(255) default NULL,
+  `keylist` varchar(128) default NULL,
+  `hostname` varchar(64) NOT NULL default '',
+  PRIMARY KEY  (`context`,`action`,`hostname`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `keybindings`
+--
+
+LOCK TABLES `keybindings` WRITE;
+/*!40000 ALTER TABLE `keybindings` DISABLE KEYS */;
+INSERT INTO `keybindings` (`context`, `action`, `description`, `keylist`, `hostname`) VALUES ('Global','UP','Up Arrow','Up','larch5'),('Global','DOWN','Down Arrow','Down','larch5'),('Global','LEFT','Left Arrow','Left','larch5'),('Global','RIGHT','Right Arrow','Right','larch5'),('Global','SELECT','Select','Return,Enter,Space','larch5'),('Global','ESCAPE','Escape','Esc','larch5'),('Global','MENU','Pop-up menu','M','larch5'),('Global','INFO','More information','I','larch5'),('Global','PAGEUP','Page Up','PgUp','larch5'),('Global','PAGEDOWN','Page Down','PgDown','larch5'),('Global','PREVVIEW','Previous View','Home','larch5'),('Global','NEXTVIEW','Next View','End','larch5'),('Global','HELP','Help','F1','larch5'),('Global','EJECT','Eject Removable Media','','larch5'),('Global','0','0','0','larch5'),('Global','1','1','1','larch5'),('Global','2','2','2','larch5'),('Global','3','3','3','larch5'),('Global','4','4','4','larch5'),('Global','5','5','5','larch5'),('Global','6','6','6','larch5'),('Global','7','7','7','larch5'),('Global','8','8','8','larch5'),('Global','9','9','9','larch5'),('TV Playback','CREATEPBPVIEW','Create Picture-by-Picture view','','larch5'),('TV Playback','CREATEPIPVIEW','Create Picture-in-Picture view','','larch5'),('TV Frontend','PAGEUP','Page Up','3','larch5'),('TV Frontend','PAGEDOWN','Page Down','9','larch5'),('TV Playback','NEXTPIPWINDOW','Toggle active PIP/PBP window','B','larch5'),('TV Frontend','PLAYBACK','Play Program','P','larch5'),('TV Frontend','TOGGLERECORD','Toggle recording status of current program','R','larch5'),('TV Frontend','DAYLEFT','Page the program guide back one day','Home,7','larch5'),('TV Frontend','DAYRIGHT','Page the program guide forward one day','End,1','larch5'),('TV Frontend','PAGELEFT','Page the program guide left',',,<','larch5'),('TV Frontend','PAGERIGHT','Page the program guide right','>,.','larch5'),('TV Frontend','TOGGLEFAV','Toggle the current channel as a favorite','?','larch5'),('TV Frontend','TOGGLEEPGORDER','Reverse the channel order in the program guide','0','larch5'),('TV Frontend','GUIDE','Show the Program Guide','S','larch5'),('TV Frontend','FINDER','Show the Program Finder','#','larch5'),('TV Frontend','NEXTFAV','Cycle through channel groups and all channels in the program guide.','/','larch5'),('TV Frontend','CHANUPDATE','Switch channels without exiting guide in Live TV mode.','X','larch5'),('TV Frontend','VOLUMEDOWN','Volume down','[,{,F10,Volume Down','larch5'),('TV Frontend','VOLUMEUP','Volume up','],},F11,Volume Up','larch5'),('TV Frontend','MUTE','Mute','|,\\,F9,Volume Mute','larch5'),('TV Frontend','RANKINC','Increase program or channel rank','Right','larch5'),('TV Frontend','RANKDEC','Decrease program or channel rank','Left','larch5'),('TV Frontend','UPCOMING','List upcoming episodes','O','larch5'),('TV Frontend','DETAILS','Show program details','U','larch5'),('TV Frontend','VIEWCARD','Switch Capture Card view','Y','larch5'),('TV Frontend','VIEWINPUT','Switch Capture Card view','C','larch5'),('TV Frontend','CUSTOMEDIT','Edit Custom Record Rule','E','larch5'),('TV Frontend','CHANGERECGROUP','Change Recording Group','','larch5'),('TV Frontend','CHANGEGROUPVIEW','Change Group View','','larch5'),('TV Playback','CLEAROSD','Clear OSD','Backspace','larch5'),('TV Playback','PAUSE','Pause','P','larch5'),('TV Playback','SEEKFFWD','Fast Forward','Right','larch5'),('TV Playback','SEEKRWND','Rewind','Left','larch5'),('TV Playback','ARBSEEK','Arbitrary Seek','*','larch5'),('TV Playback','CHANNELUP','Channel up','Up','larch5'),('TV Playback','CHANNELDOWN','Channel down','Down','larch5'),('TV Playback','NEXTFAV','Switch to the next favorite channel','/','larch5'),('TV Playback','PREVCHAN','Switch to the previous channel','H','larch5'),('TV Playback','JUMPFFWD','Jump ahead','PgDown','larch5'),('TV Playback','JUMPRWND','Jump back','PgUp','larch5'),('TV Playback','JUMPBKMRK','Jump to bookmark','K','larch5'),('TV Playback','FFWDSTICKY','Fast Forward (Sticky) or Forward one frame while paused','>,.','larch5'),('TV Playback','RWNDSTICKY','Rewind (Sticky) or Rewind one frame while paused',',,<','larch5'),('TV Playback','NEXTSOURCE','Next Video Source','Y','larch5'),('TV Playback','PREVSOURCE','Previous Video Source','Ctrl+Y','larch5'),('TV Playback','NEXTINPUT','Next Input','C','larch5'),('TV Playback','NEXTCARD','Next Card','','larch5'),('TV Playback','SKIPCOMMERCIAL','Skip Commercial','Z,End','larch5'),('TV Playback','SKIPCOMMBACK','Skip Commercial (Reverse)','Q,Home','larch5'),('TV Playback','JUMPSTART','Jump to the start of the recording.','Ctrl+B','larch5'),('TV Playback','TOGGLEBROWSE','Toggle channel browse mode','O','larch5'),('TV Playback','TOGGLERECORD','Toggle recording status of current program','R','larch5'),('TV Playback','TOGGLEFAV','Toggle the current channel as a favorite','?','larch5'),('TV Playback','VOLUMEDOWN','Volume down','[,{,F10,Volume Down','larch5'),('TV Playback','VOLUMEUP','Volume up','],},F11,Volume Up','larch5'),('TV Playback','MUTE','Mute','|,\\,F9,Volume Mute','larch5'),('TV Playback','TOGGLEPIPMODE','Toggle Picture-in-Picture view','V','larch5'),('TV Playback','TOGGLEPIPWINDOW','Toggle active PiP window','B','larch5'),('TV Playback','SWAPPIP','Swap PBP/PIP Windows','N','larch5'),('TV Playback','TOGGLEASPECT','Toggle the video aspect ratio','Ctrl+W','larch5'),('TV Playback','TOGGLEFILL','Next Preconfigured Zoom mode','W','larch5'),('TV Playback','TOGGLECC','Toggle any captions','T','larch5'),('TV Playback','TOGGLETTC','Toggle Teletext Captions','','larch5'),('TV Playback','TOGGLESUBTITLE','Toggle Subtitles','','larch5'),('TV Playback','TOGGLECC608','Toggle VBI CC','','larch5'),('TV Playback','TOGGLECC708','Toggle ATSC CC','','larch5'),('TV Playback','TOGGLETTM','Toggle Teletext Menu','','larch5'),('TV Playback','SELECTAUDIO_0','Play audio track 1','','larch5'),('TV Playback','SELECTAUDIO_1','Play audio track 2','','larch5'),('TV Playback','SELECTSUBTITLE_0','Display subtitle 1','','larch5'),('TV Playback','SELECTSUBTITLE_1','Display subtitle 2','','larch5'),('TV Playback','SELECTCC608_0','Display VBI CC1','','larch5'),('TV Playback','SELECTCC608_1','Display VBI CC2','','larch5'),('TV Playback','SELECTCC608_2','Display VBI CC3','','larch5'),('TV Playback','SELECTCC608_3','Display VBI CC4','','larch5'),('TV Playback','SELECTCC708_0','Display ATSC CC1','','larch5'),('TV Playback','SELECTCC708_1','Display ATSC CC2','','larch5'),('TV Playback','SELECTCC708_2','Display ATSC CC3','','larch5'),('TV Playback','SELECTCC708_3','Display ATSC CC4','','larch5'),('TV Playback','NEXTAUDIO','Next audio track','+','larch5'),('TV Playback','PREVAUDIO','Previous audio track','-','larch5'),('TV Playback','NEXTSUBTITLE','Next subtitle track','','larch5'),('TV Playback','PREVSUBTITLE','Previous subtitle track','','larch5'),('TV Playback','NEXTCC608','Next VBI CC track','','larch5'),('TV Playback','PREVCC608','Previous VBI CC track','','larch5'),('TV Playback','NEXTCC708','Next ATSC CC track','','larch5'),('TV Playback','PREVCC708','Previous ATSC CC track','','larch5'),('TV Playback','NEXTCC','Next of any captions','','larch5'),('TV Playback','NEXTSCAN','Next video scan overidemode','','larch5'),('TV Playback','QUEUETRANSCODE','Queue the current recording for transcoding','X','larch5'),('TV Playback','SPEEDINC','Increase the playback speed','U','larch5'),('TV Playback','SPEEDDEC','Decrease the playback speed','J','larch5'),('TV Playback','ADJUSTSTRETCH','Turn on time stretch control','A','larch5'),('TV Playback','STRETCHINC','Increase time stretch speed','','larch5'),('TV Playback','STRETCHDEC','Decrease time stretch speed','','larch5'),('TV Playback','TOGGLESTRETCH','Toggle time stretch speed','','larch5'),('TV Playback','TOGGLEAUDIOSYNC','Turn on audio sync adjustment controls','','larch5'),('TV Playback','TOGGLEPICCONTROLS','Playback picture adjustments','F','larch5'),('TV Playback','TOGGLECHANCONTROLS','Recording picture adjustments for this channel','Ctrl+G','larch5'),('TV Playback','TOGGLERECCONTROLS','Recording picture adjustments for this recorder','G','larch5'),('TV Playback','TOGGLEPBPMODE','Toggle Picture-by-Picture view','Ctrl+V','larch5'),('TV Playback','CYCLECOMMSKIPMODE','Cycle Commercial Skip mode','','larch5'),('TV Playback','GUIDE','Show the Program Guide','S','larch5'),('TV Playback','FINDER','Show the Program Finder','#','larch5'),('TV Playback','TOGGLESLEEP','Toggle the Sleep Timer','F8','larch5'),('TV Playback','PLAY','Play','Ctrl+P','larch5'),('TV Playback','JUMPPREV','Jump to previously played recording','','larch5'),('TV Playback','JUMPREC','Display menu of recorded programs to jump to','','larch5'),('TV Playback','VIEWSCHEDULED','Display scheduled recording list','','larch5'),('TV Playback','SIGNALMON','Monitor Signal Quality','Alt+F7','larch5'),('TV Playback','JUMPTODVDROOTMENU','Jump to the DVD Root Menu','','larch5'),('TV Playback','EXITSHOWNOPROMPTS','Exit Show without any prompts','','larch5'),('TV Playback','SCREENSHOT','Save screenshot of current video frame','','larch5'),('TV Playback','MENURED','Menu Red','F2','larch5'),('TV Playback','MENUGREEN','Menu Green','F3','larch5'),('TV Playback','MENUYELLOW','Menu Yellow','F4','larch5'),('TV Playback','MENUBLUE','Menu Blue','F5','larch5'),('TV Playback','TEXTEXIT','Menu Exit','F6','larch5'),('TV Playback','MENUTEXT','Menu Text','F7','larch5'),('TV Playback','MENUEPG','Menu EPG','F12','larch5'),('TV Editing','CLEARMAP','Clear editing cut points','C,Q,Home','larch5'),('TV Editing','INVERTMAP','Invert Begin/End cut points','I','larch5'),('TV Editing','LOADCOMMSKIP','Load cut list from commercial skips','Z,End','larch5'),('TV Editing','NEXTCUT','Jump to the next cut point','PgDown','larch5'),('TV Editing','PREVCUT','Jump to the previous cut point','PgUp','larch5'),('TV Editing','BIGJUMPREW','Jump back 10x the normal amount',',,<','larch5'),('TV Editing','BIGJUMPFWD','Jump forward 10x the normal amount','>,.','larch5'),('Teletext Menu','NEXTPAGE','Next Page','Down','larch5'),('Teletext Menu','PREVPAGE','Previous Page','Up','larch5'),('Teletext Menu','NEXTSUBPAGE','Next Subpage','Right','larch5'),('Teletext Menu','PREVSUBPAGE','Previous Subpage','Left','larch5'),('Teletext Menu','TOGGLETT','Toggle Teletext','T','larch5'),('Teletext Menu','MENURED','Menu Red','F2','larch5'),('Teletext Menu','MENUGREEN','Menu Green','F3','larch5'),('Teletext Menu','MENUYELLOW','Menu Yellow','F4','larch5'),('Teletext Menu','MENUBLUE','Menu Blue','F5','larch5'),('Teletext Menu','MENUWHITE','Menu White','F6','larch5'),('Teletext Menu','TOGGLEBACKGROUND','Toggle Background','F7','larch5'),('Teletext Menu','REVEAL','Reveal hidden Text','F8','larch5'),('Archive','TOGGLECUT','Toggle use cut list state for selected program','C','larch5'),('NetFlix','MOVETOTOP','Moves movie to top of queue','1','larch5'),('Video','DOWNLOADDATA','Download metadata for current item','W','larch5'),('Gallery','PLAY','Start/Stop Slideshow','P','larch5'),('Gallery','HOME','Go to the first image in thumbnail view','Home','larch5'),('Gallery','END','Go to the last image in thumbnail view','End','larch5'),('Gallery','MENU','Toggle activating menu in thumbnail view','M','larch5'),('Gallery','SLIDESHOW','Start Slideshow in thumbnail view','S','larch5'),('Gallery','RANDOMSHOW','Start Random Slideshow in thumbnail view','R','larch5'),('Gallery','ROTRIGHT','Rotate image right 90 degrees','],3','larch5'),('Gallery','ROTLEFT','Rotate image left 90 degrees','[,1','larch5'),('Gallery','ZOOMOUT','Zoom image out','7','larch5'),('Gallery','ZOOMIN','Zoom image in','9','larch5'),('Gallery','SCROLLUP','Scroll image up','2','larch5'),('Gallery','SCROLLLEFT','Scroll image left','4','larch5'),('Gallery','SCROLLRIGHT','Scroll image right','6','larch5'),('Gallery','SCROLLDOWN','Scroll image down','8','larch5'),('Gallery','RECENTER','Recenter image','5','larch5'),('Gallery','FULLSIZE','Full-size (un-zoom) image','0','larch5'),('Gallery','UPLEFT','Go to the upper-left corner of the image','PgUp','larch5'),('Gallery','LOWRIGHT','Go to the lower-right corner of the image','PgDown','larch5'),('Gallery','INFO','Toggle Showing Information about Image','I','larch5'),('Video','INCSEARCH','Show Incremental Search Dialog','Ctrl+S','larch5'),('Gallery','MARK','Mark image','T','larch5'),('Gallery','FULLSCREEN','Toggle scale to fullscreen/scale to fit','W','larch5'),('Game','TOGGLEFAV','Toggle the current game as a favorite','?,/','larch5'),('Game','INCSEARCH','Show incremental search dialog','Ctrl+S','larch5'),('Game','INCSEARCHNEXT','Incremental search find next match','Ctrl+N','larch5'),('Music','NEXTTRACK','Move to the next track','>,.,Z,End','larch5'),('Music','PREVTRACK','Move to the previous track',',,<,Q,Home','larch5'),('Music','FFWD','Fast forward','PgDown','larch5'),('Music','RWND','Rewind','PgUp','larch5'),('Music','PAUSE','Pause/Start playback','P','larch5'),('Music','PLAY','Start playback','','larch5'),('Music','STOP','Stop playback','O','larch5'),('Music','VOLUMEDOWN','Volume down','[,{,F10,Volume Down','larch5'),('Music','VOLUMEUP','Volume up','],},F11,Volume Up','larch5'),('Music','MUTE','Mute','|,\\,F9,Volume Mute','larch5'),('Music','CYCLEVIS','Cycle visualizer mode','6','larch5'),('Music','BLANKSCR','Blank screen','5','larch5'),('Music','THMBUP','Increase rating','9','larch5'),('Music','THMBDOWN','Decrease rating','7','larch5'),('Music','REFRESH','Refresh music tree','8','larch5'),('Music','FILTER','Filter All My Music','F','larch5'),('Music','INCSEARCH','Show incremental search dialog','Ctrl+S','larch5'),('Music','INCSEARCHNEXT','Incremental search find next match','Ctrl+N','larch5'),('Music','SPEEDUP','Increase Play Speed','W','larch5'),('Music','SPEEDDOWN','Decrease Play Speed','X','larch5'),('News','RETRIEVENEWS','Update news items','I','larch5'),('News','FORCERETRIEVE','Force update news items','M','larch5'),('News','CANCEL','Cancel news item updating','C','larch5'),('Phone','0','0','0','larch5'),('Phone','1','1','1','larch5'),('Phone','2','2','2','larch5'),('Phone','3','3','3','larch5'),('Phone','4','4','4','larch5'),('Phone','5','5','5','larch5'),('Phone','6','6','6','larch5'),('Phone','7','7','7','larch5'),('Phone','8','8','8','larch5'),('Phone','9','9','9','larch5'),('Phone','HASH','HASH','#','larch5'),('Phone','STAR','STAR','*','larch5'),('Phone','Up','Up','Up','larch5'),('Phone','Down','Down','Down','larch5'),('Phone','Left','Left','Left','larch5'),('Phone','Right','Right','Right','larch5'),('Phone','VOLUMEDOWN','Volume down','[,{,F10,Volume Down','larch5'),('Phone','VOLUMEUP','Volume up','],},F11,Volume Up','larch5'),('Phone','MUTE','Mute','|,\\,F9,Volume Mute','larch5'),('Phone','ZOOMIN','Zoom the video window in','>,.,Z,End','larch5'),('Phone','ZOOMOUT','Zoom the video window out',',,<,Q,Home','larch5'),('Phone','FULLSCRN','Show received video full-screen','P','larch5'),('Phone','HANGUP','Hangup an active call','O','larch5'),('Phone','LOOPBACK','Loopback Video','L','larch5'),('Video','FILTER','Open video filter dialog','F','larch5'),('Video','PLAYALT','Play selected item in alternate player','ALT+P','larch5'),('Video','BROWSE','Change browsable in video manager','B','larch5'),('Video','INCPARENT','Increase Parental Level','],},F11','larch5'),('Video','DECPARENT','Decrease Parental Level','[,{,F10','larch5'),('Video','HOME','Go to the first video','Home','larch5'),('Video','END','Go to the last video','End','larch5'),('Weather','PAUSE','Pause current page','P','larch5'),('Weather','SEARCH','Search List','/','larch5'),('Weather','NEXTSEARCH','Search List','n','larch5'),('Weather','UPDATE','Search List','u','larch5'),('Global','NEXT','Move to next widget','Tab','larch5'),('Global','PREVIOUS','Move to preview widget','Backtab','larch5'),('Global','BACKSPACE','Backspace','Backspace','larch5'),('Global','DELETE','Delete','D','larch5'),('Global','EDIT','Edit','E','larch5'),('Global','PAGETOP','Page to top of list','','larch5'),('Global','PAGEMIDDLE','Page to middle of list','','larch5'),('Global','PAGEBOTTOM','Page to bottom of list','','larch5'),('Browser','ZOOMIN','Zoom in on browser window','.,>','larch5'),('Browser','ZOOMOUT','Zoom out on browser window',',,<','larch5'),('Browser','TOGGLEINPUT','Toggle where keyboard input goes to','F1','larch5'),('Browser','MOUSEUP','Move mouse pointer up','2','larch5'),('Browser','MOUSEDOWN','Move mouse pointer down','8','larch5'),('Browser','MOUSELEFT','Move mouse pointer left','4','larch5'),('Browser','MOUSERIGHT','Move mouse pointer right','6','larch5'),('Browser','MOUSELEFTBUTTON','Mouse Left button click','5','larch5'),('Browser','PAGEDOWN','Scroll down half a page','9','larch5'),('Browser','PAGEUP','Scroll up half a page','3','larch5'),('Browser','PAGELEFT','Scroll left half a page','7','larch5'),('Browser','PAGERIGHT','Scroll right half a page','1','larch5'),('Browser','NEXTLINK','Move selection to next link','Z','larch5'),('Browser','PREVIOUSLINK','Move selection to previous link','Q','larch5'),('Browser','FOLLOWLINK','Follow selected link','Return,Space,Enter','larch5'),('Browser','HISTORYBACK','Go back to previous page','R,Backspace','larch5'),('Browser','HISTORYFORWARD','Go forward to previous page','F','larch5'),('Welcome','STARTXTERM','Open an Xterm window','F12','larch5'),('Welcome','SHOWSETTINGS','Show Mythshutdown settings','F11','larch5'),('TV Playback','TOGGLEPIPSTATE','Change PxP view','','larch5'),('Browser','NEXTTAB','Move to next browser tab','P','larch5'),('Browser','PREVTAB','Move to previous browser tab','','larch5'),('Video','ITEMDETAIL','Display Item Detail Popup','','larch5');
+/*!40000 ALTER TABLE `keybindings` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `keyword`
+--
+
+DROP TABLE IF EXISTS `keyword`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `keyword` (
+  `phrase` varchar(128) character set utf8 collate utf8_bin NOT NULL default '',
+  `searchtype` int(10) unsigned NOT NULL default '3',
+  UNIQUE KEY `phrase` (`phrase`,`searchtype`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `keyword`
+--
+
+LOCK TABLES `keyword` WRITE;
+/*!40000 ALTER TABLE `keyword` DISABLE KEYS */;
+/*!40000 ALTER TABLE `keyword` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_albumart`
+--
+
+DROP TABLE IF EXISTS `music_albumart`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_albumart` (
+  `albumart_id` int(20) NOT NULL auto_increment,
+  `filename` varchar(255) NOT NULL default '',
+  `directory_id` int(20) NOT NULL default '0',
+  `imagetype` tinyint(3) NOT NULL default '0',
+  `song_id` int(11) NOT NULL default '0',
+  `embedded` tinyint(1) NOT NULL default '0',
+  PRIMARY KEY  (`albumart_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_albumart`
+--
+
+LOCK TABLES `music_albumart` WRITE;
+/*!40000 ALTER TABLE `music_albumart` DISABLE KEYS */;
+/*!40000 ALTER TABLE `music_albumart` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_albums`
+--
+
+DROP TABLE IF EXISTS `music_albums`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_albums` (
+  `album_id` int(11) unsigned NOT NULL auto_increment,
+  `artist_id` int(11) unsigned NOT NULL default '0',
+  `album_name` varchar(255) NOT NULL default '',
+  `year` smallint(6) NOT NULL default '0',
+  `compilation` tinyint(1) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`album_id`),
+  KEY `idx_album_name` (`album_name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_albums`
+--
+
+LOCK TABLES `music_albums` WRITE;
+/*!40000 ALTER TABLE `music_albums` DISABLE KEYS */;
+/*!40000 ALTER TABLE `music_albums` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_artists`
+--
+
+DROP TABLE IF EXISTS `music_artists`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_artists` (
+  `artist_id` int(11) unsigned NOT NULL auto_increment,
+  `artist_name` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`artist_id`),
+  KEY `idx_artist_name` (`artist_name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_artists`
+--
+
+LOCK TABLES `music_artists` WRITE;
+/*!40000 ALTER TABLE `music_artists` DISABLE KEYS */;
+/*!40000 ALTER TABLE `music_artists` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_directories`
+--
+
+DROP TABLE IF EXISTS `music_directories`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_directories` (
+  `directory_id` int(20) NOT NULL auto_increment,
+  `path` text NOT NULL,
+  `parent_id` int(20) NOT NULL default '0',
+  PRIMARY KEY  (`directory_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_directories`
+--
+
+LOCK TABLES `music_directories` WRITE;
+/*!40000 ALTER TABLE `music_directories` DISABLE KEYS */;
+/*!40000 ALTER TABLE `music_directories` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_genres`
+--
+
+DROP TABLE IF EXISTS `music_genres`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_genres` (
+  `genre_id` int(11) unsigned NOT NULL auto_increment,
+  `genre` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`genre_id`),
+  KEY `idx_genre` (`genre`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_genres`
+--
+
+LOCK TABLES `music_genres` WRITE;
+/*!40000 ALTER TABLE `music_genres` DISABLE KEYS */;
+/*!40000 ALTER TABLE `music_genres` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_playlists`
+--
+
+DROP TABLE IF EXISTS `music_playlists`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_playlists` (
+  `playlist_id` int(11) unsigned NOT NULL auto_increment,
+  `playlist_name` varchar(255) NOT NULL default '',
+  `playlist_songs` text NOT NULL,
+  `last_accessed` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  `length` int(11) unsigned NOT NULL default '0',
+  `songcount` smallint(8) unsigned NOT NULL default '0',
+  `hostname` varchar(64) NOT NULL default '',
+  PRIMARY KEY  (`playlist_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_playlists`
+--
+
+LOCK TABLES `music_playlists` WRITE;
+/*!40000 ALTER TABLE `music_playlists` DISABLE KEYS */;
+/*!40000 ALTER TABLE `music_playlists` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_smartplaylist_categories`
+--
+
+DROP TABLE IF EXISTS `music_smartplaylist_categories`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_smartplaylist_categories` (
+  `categoryid` int(10) unsigned NOT NULL auto_increment,
+  `name` varchar(128) NOT NULL,
+  PRIMARY KEY  (`categoryid`),
+  KEY `name` (`name`)
+) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_smartplaylist_categories`
+--
+
+LOCK TABLES `music_smartplaylist_categories` WRITE;
+/*!40000 ALTER TABLE `music_smartplaylist_categories` DISABLE KEYS */;
+INSERT INTO `music_smartplaylist_categories` (`categoryid`, `name`) VALUES (1,'Decades'),(2,'Favourite Tracks'),(3,'New Tracks');
+/*!40000 ALTER TABLE `music_smartplaylist_categories` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_smartplaylist_items`
+--
+
+DROP TABLE IF EXISTS `music_smartplaylist_items`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_smartplaylist_items` (
+  `smartplaylistitemid` int(10) unsigned NOT NULL auto_increment,
+  `smartplaylistid` int(10) unsigned NOT NULL,
+  `field` varchar(50) NOT NULL,
+  `operator` varchar(20) NOT NULL,
+  `value1` varchar(255) NOT NULL,
+  `value2` varchar(255) NOT NULL,
+  PRIMARY KEY  (`smartplaylistitemid`),
+  KEY `smartplaylistid` (`smartplaylistid`)
+) ENGINE=MyISAM AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_smartplaylist_items`
+--
+
+LOCK TABLES `music_smartplaylist_items` WRITE;
+/*!40000 ALTER TABLE `music_smartplaylist_items` DISABLE KEYS */;
+INSERT INTO `music_smartplaylist_items` (`smartplaylistitemid`, `smartplaylistid`, `field`, `operator`, `value1`, `value2`) VALUES (1,1,'Year','is between','1960','1969'),(2,2,'Year','is between','1970','1979'),(3,3,'Year','is between','1980','1989'),(4,4,'Year','is between','1990','1999'),(5,5,'Year','is between','2000','2009'),(6,6,'Rating','is greater than','7','0'),(7,7,'Play Count','is greater than','0','0'),(8,8,'Play Count','is equal to','0','0');
+/*!40000 ALTER TABLE `music_smartplaylist_items` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_smartplaylists`
+--
+
+DROP TABLE IF EXISTS `music_smartplaylists`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_smartplaylists` (
+  `smartplaylistid` int(10) unsigned NOT NULL auto_increment,
+  `name` varchar(128) NOT NULL,
+  `categoryid` int(10) unsigned NOT NULL,
+  `matchtype` set('All','Any') character set latin1 NOT NULL default 'All',
+  `orderby` varchar(128) NOT NULL default '',
+  `limitto` int(10) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`smartplaylistid`),
+  KEY `name` (`name`),
+  KEY `categoryid` (`categoryid`)
+) ENGINE=MyISAM AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_smartplaylists`
+--
+
+LOCK TABLES `music_smartplaylists` WRITE;
+/*!40000 ALTER TABLE `music_smartplaylists` DISABLE KEYS */;
+INSERT INTO `music_smartplaylists` (`smartplaylistid`, `name`, `categoryid`, `matchtype`, `orderby`, `limitto`) VALUES (1,'1960\'s',1,'All','Artist (A)',0),(2,'1970\'s',1,'All','Artist (A)',0),(3,'1980\'s',1,'All','Artist (A)',0),(4,'1990\'s',1,'All','Artist (A)',0),(5,'2000\'s',1,'All','Artist (A)',0),(6,'Favorite Tracks',2,'All','Artist (A), Album (A)',0),(7,'100 Most Played Tracks',2,'All','Play Count (D)',100),(8,'Never Played Tracks',3,'All','Artist (A), Album (A)',0);
+/*!40000 ALTER TABLE `music_smartplaylists` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_songs`
+--
+
+DROP TABLE IF EXISTS `music_songs`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_songs` (
+  `song_id` int(11) unsigned NOT NULL auto_increment,
+  `filename` text NOT NULL,
+  `name` varchar(255) NOT NULL default '',
+  `track` smallint(6) unsigned NOT NULL default '0',
+  `artist_id` int(11) unsigned NOT NULL default '0',
+  `album_id` int(11) unsigned NOT NULL default '0',
+  `genre_id` int(11) unsigned NOT NULL default '0',
+  `year` smallint(6) NOT NULL default '0',
+  `length` int(11) unsigned NOT NULL default '0',
+  `numplays` int(11) unsigned NOT NULL default '0',
+  `rating` tinyint(4) unsigned NOT NULL default '0',
+  `lastplay` datetime default NULL,
+  `date_entered` datetime default NULL,
+  `date_modified` datetime default NULL,
+  `format` varchar(4) NOT NULL default '0',
+  `mythdigest` varchar(255) default NULL,
+  `size` bigint(20) unsigned default NULL,
+  `description` varchar(255) default NULL,
+  `comment` varchar(255) default NULL,
+  `disc_count` smallint(5) unsigned default '0',
+  `disc_number` smallint(5) unsigned default '0',
+  `track_count` smallint(5) unsigned default '0',
+  `start_time` int(10) unsigned default '0',
+  `stop_time` int(10) unsigned default NULL,
+  `eq_preset` varchar(255) default NULL,
+  `relative_volume` tinyint(4) default '0',
+  `sample_rate` int(10) unsigned default '0',
+  `bitrate` int(10) unsigned default '0',
+  `bpm` smallint(5) unsigned default NULL,
+  `directory_id` int(20) NOT NULL default '0',
+  PRIMARY KEY  (`song_id`),
+  KEY `idx_name` (`name`),
+  KEY `idx_mythdigest` (`mythdigest`),
+  KEY `directory_id` (`directory_id`),
+  KEY `album_id` (`album_id`),
+  KEY `genre_id` (`genre_id`),
+  KEY `artist_id` (`artist_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_songs`
+--
+
+LOCK TABLES `music_songs` WRITE;
+/*!40000 ALTER TABLE `music_songs` DISABLE KEYS */;
+/*!40000 ALTER TABLE `music_songs` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_stats`
+--
+
+DROP TABLE IF EXISTS `music_stats`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_stats` (
+  `num_artists` smallint(5) unsigned NOT NULL default '0',
+  `num_albums` smallint(5) unsigned NOT NULL default '0',
+  `num_songs` mediumint(8) unsigned NOT NULL default '0',
+  `num_genres` tinyint(3) unsigned NOT NULL default '0',
+  `total_time` varchar(12) NOT NULL default '0',
+  `total_size` varchar(10) NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_stats`
+--
+
+LOCK TABLES `music_stats` WRITE;
+/*!40000 ALTER TABLE `music_stats` DISABLE KEYS */;
+/*!40000 ALTER TABLE `music_stats` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `mythlog`
+--
+
+DROP TABLE IF EXISTS `mythlog`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `mythlog` (
+  `logid` int(10) unsigned NOT NULL auto_increment,
+  `module` varchar(32) NOT NULL default '',
+  `priority` int(11) NOT NULL default '0',
+  `acknowledged` tinyint(1) default '0',
+  `logdate` datetime default NULL,
+  `host` varchar(128) default NULL,
+  `message` varchar(255) NOT NULL default '',
+  `details` text,
+  PRIMARY KEY  (`logid`),
+  KEY `module` (`module`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `mythlog`
+--
+
+LOCK TABLES `mythlog` WRITE;
+/*!40000 ALTER TABLE `mythlog` DISABLE KEYS */;
+/*!40000 ALTER TABLE `mythlog` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `netflix`
+--
+
+DROP TABLE IF EXISTS `netflix`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `netflix` (
+  `name` varchar(100) NOT NULL,
+  `category` varchar(255) NOT NULL,
+  `url` varchar(255) NOT NULL,
+  `ico` varchar(255) default NULL,
+  `updated` int(10) unsigned default NULL,
+  `is_queue` int(10) unsigned default NULL,
+  `queue` varchar(32) NOT NULL default '',
+  PRIMARY KEY  (`name`,`queue`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `netflix`
+--
+
+LOCK TABLES `netflix` WRITE;
+/*!40000 ALTER TABLE `netflix` DISABLE KEYS */;
+/*!40000 ALTER TABLE `netflix` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `networkiconmap`
+--
+
+DROP TABLE IF EXISTS `networkiconmap`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `networkiconmap` (
+  `id` int(11) NOT NULL auto_increment,
+  `network` varchar(20) NOT NULL default '',
+  `url` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `network` (`network`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `networkiconmap`
+--
+
+LOCK TABLES `networkiconmap` WRITE;
+/*!40000 ALTER TABLE `networkiconmap` DISABLE KEYS */;
+/*!40000 ALTER TABLE `networkiconmap` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `oldfind`
+--
+
+DROP TABLE IF EXISTS `oldfind`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `oldfind` (
+  `recordid` int(11) NOT NULL default '0',
+  `findid` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`recordid`,`findid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `oldfind`
+--
+
+LOCK TABLES `oldfind` WRITE;
+/*!40000 ALTER TABLE `oldfind` DISABLE KEYS */;
+/*!40000 ALTER TABLE `oldfind` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `oldprogram`
+--
+
+DROP TABLE IF EXISTS `oldprogram`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `oldprogram` (
+  `oldtitle` varchar(128) character set utf8 collate utf8_bin NOT NULL default '',
+  `airdate` datetime NOT NULL default '0000-00-00 00:00:00',
+  PRIMARY KEY  (`oldtitle`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `oldprogram`
+--
+
+LOCK TABLES `oldprogram` WRITE;
+/*!40000 ALTER TABLE `oldprogram` DISABLE KEYS */;
+/*!40000 ALTER TABLE `oldprogram` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `oldrecorded`
+--
+
+DROP TABLE IF EXISTS `oldrecorded`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `oldrecorded` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `endtime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `title` varchar(128) NOT NULL default '',
+  `subtitle` varchar(128) NOT NULL default '',
+  `description` text NOT NULL,
+  `category` varchar(64) NOT NULL default '',
+  `seriesid` varchar(40) NOT NULL default '',
+  `programid` varchar(40) NOT NULL default '',
+  `findid` int(11) NOT NULL default '0',
+  `recordid` int(11) NOT NULL default '0',
+  `station` varchar(20) NOT NULL default '',
+  `rectype` int(10) unsigned NOT NULL default '0',
+  `duplicate` tinyint(1) NOT NULL default '0',
+  `recstatus` int(11) NOT NULL default '0',
+  `reactivate` smallint(6) NOT NULL default '0',
+  `generic` tinyint(1) default '0',
+  PRIMARY KEY  (`station`,`starttime`,`title`),
+  KEY `endtime` (`endtime`),
+  KEY `title` (`title`),
+  KEY `seriesid` (`seriesid`),
+  KEY `programid` (`programid`),
+  KEY `recordid` (`recordid`),
+  KEY `recstatus` (`recstatus`,`programid`,`seriesid`),
+  KEY `recstatus_2` (`recstatus`,`title`,`subtitle`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `oldrecorded`
+--
+
+LOCK TABLES `oldrecorded` WRITE;
+/*!40000 ALTER TABLE `oldrecorded` DISABLE KEYS */;
+/*!40000 ALTER TABLE `oldrecorded` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `people`
+--
+
+DROP TABLE IF EXISTS `people`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `people` (
+  `person` mediumint(8) unsigned NOT NULL auto_increment,
+  `name` varchar(128) character set utf8 collate utf8_bin NOT NULL default '',
+  PRIMARY KEY  (`person`),
+  UNIQUE KEY `name` (`name`(41))
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `people`
+--
+
+LOCK TABLES `people` WRITE;
+/*!40000 ALTER TABLE `people` DISABLE KEYS */;
+/*!40000 ALTER TABLE `people` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `phonecallhistory`
+--
+
+DROP TABLE IF EXISTS `phonecallhistory`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `phonecallhistory` (
+  `recid` int(10) unsigned NOT NULL auto_increment,
+  `displayname` text NOT NULL,
+  `url` text NOT NULL,
+  `timestamp` text NOT NULL,
+  `duration` int(10) unsigned NOT NULL,
+  `directionin` int(10) unsigned NOT NULL,
+  `directoryref` int(10) unsigned default NULL,
+  PRIMARY KEY  (`recid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `phonecallhistory`
+--
+
+LOCK TABLES `phonecallhistory` WRITE;
+/*!40000 ALTER TABLE `phonecallhistory` DISABLE KEYS */;
+/*!40000 ALTER TABLE `phonecallhistory` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `phonedirectory`
+--
+
+DROP TABLE IF EXISTS `phonedirectory`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `phonedirectory` (
+  `intid` int(10) unsigned NOT NULL auto_increment,
+  `nickname` text NOT NULL,
+  `firstname` text,
+  `surname` text,
+  `url` text NOT NULL,
+  `directory` text NOT NULL,
+  `photofile` text,
+  `speeddial` int(10) unsigned NOT NULL,
+  `onhomelan` int(10) unsigned default '0',
+  PRIMARY KEY  (`intid`)
+) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `phonedirectory`
+--
+
+LOCK TABLES `phonedirectory` WRITE;
+/*!40000 ALTER TABLE `phonedirectory` DISABLE KEYS */;
+INSERT INTO `phonedirectory` (`intid`, `nickname`, `firstname`, `surname`, `url`, `directory`, `photofile`, `speeddial`, `onhomelan`) VALUES (1,'Me(larch5)','Local Myth Host','larch5','','My MythTVs','',1,1);
+/*!40000 ALTER TABLE `phonedirectory` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `pidcache`
+--
+
+DROP TABLE IF EXISTS `pidcache`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `pidcache` (
+  `chanid` smallint(6) NOT NULL default '0',
+  `pid` int(11) NOT NULL default '-1',
+  `tableid` int(11) NOT NULL default '-1',
+  KEY `chanid` (`chanid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `pidcache`
+--
+
+LOCK TABLES `pidcache` WRITE;
+/*!40000 ALTER TABLE `pidcache` DISABLE KEYS */;
+/*!40000 ALTER TABLE `pidcache` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `playgroup`
+--
+
+DROP TABLE IF EXISTS `playgroup`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `playgroup` (
+  `name` varchar(32) NOT NULL default '',
+  `titlematch` varchar(255) NOT NULL default '',
+  `skipahead` int(11) NOT NULL default '0',
+  `skipback` int(11) NOT NULL default '0',
+  `timestretch` int(11) NOT NULL default '0',
+  `jump` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `playgroup`
+--
+
+LOCK TABLES `playgroup` WRITE;
+/*!40000 ALTER TABLE `playgroup` DISABLE KEYS */;
+INSERT INTO `playgroup` (`name`, `titlematch`, `skipahead`, `skipback`, `timestretch`, `jump`) VALUES ('Default','',30,5,100,0);
+/*!40000 ALTER TABLE `playgroup` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `powerpriority`
+--
+
+DROP TABLE IF EXISTS `powerpriority`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `powerpriority` (
+  `priorityname` varchar(64) character set utf8 collate utf8_bin NOT NULL,
+  `recpriority` int(10) NOT NULL default '0',
+  `selectclause` text NOT NULL,
+  PRIMARY KEY  (`priorityname`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `powerpriority`
+--
+
+LOCK TABLES `powerpriority` WRITE;
+/*!40000 ALTER TABLE `powerpriority` DISABLE KEYS */;
+/*!40000 ALTER TABLE `powerpriority` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `profilegroups`
+--
+
+DROP TABLE IF EXISTS `profilegroups`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `profilegroups` (
+  `id` int(10) unsigned NOT NULL auto_increment,
+  `name` varchar(128) default NULL,
+  `cardtype` varchar(32) NOT NULL default 'V4L',
+  `is_default` int(1) default '0',
+  `hostname` varchar(64) default NULL,
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `name` (`name`,`hostname`),
+  KEY `cardtype` (`cardtype`)
+) ENGINE=MyISAM AUTO_INCREMENT=14 DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `profilegroups`
+--
+
+LOCK TABLES `profilegroups` WRITE;
+/*!40000 ALTER TABLE `profilegroups` DISABLE KEYS */;
+INSERT INTO `profilegroups` (`id`, `name`, `cardtype`, `is_default`, `hostname`) VALUES (1,'Software Encoders (v4l based)','V4L',1,NULL),(2,'MPEG-2 Encoders (PVR-x50, PVR-500)','MPEG',1,NULL),(3,'Hardware MJPEG Encoders (Matrox G200-TV, Miro DC10, etc)','MJPEG',1,NULL),(4,'Hardware HDTV','HDTV',1,NULL),(5,'Hardware DVB Encoders','DVB',1,NULL),(6,'Transcoders','TRANSCODE',1,NULL),(7,'FireWire Input','FIREWIRE',1,NULL),(8,'USB Mpeg-4 Encoder (Plextor ConvertX, etc)','GO7007',1,NULL),(9,'DBOX2 Input','DBOX2',1,NULL),(10,'Freebox Input','Freebox',1,NULL),(11,'HDHomeRun Recorders','HDHOMERUN',1,NULL),(12,'CRC IP Recorders','CRC_IP',1,NULL),(13,'HD-PVR Recorders','HDPVR',1,NULL);
+/*!40000 ALTER TABLE `profilegroups` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `program`
+--
+
+DROP TABLE IF EXISTS `program`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `program` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `endtime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `title` varchar(128) NOT NULL default '',
+  `subtitle` varchar(128) NOT NULL default '',
+  `description` text NOT NULL,
+  `category` varchar(64) NOT NULL default '',
+  `category_type` varchar(64) NOT NULL default '',
+  `airdate` year(4) NOT NULL default '0000',
+  `stars` float NOT NULL default '0',
+  `previouslyshown` tinyint(4) NOT NULL default '0',
+  `title_pronounce` varchar(128) NOT NULL default '',
+  `stereo` tinyint(1) NOT NULL default '0',
+  `subtitled` tinyint(1) NOT NULL default '0',
+  `hdtv` tinyint(1) NOT NULL default '0',
+  `closecaptioned` tinyint(1) NOT NULL default '0',
+  `partnumber` int(11) NOT NULL default '0',
+  `parttotal` int(11) NOT NULL default '0',
+  `seriesid` varchar(64) NOT NULL default '',
+  `originalairdate` date default NULL,
+  `showtype` varchar(30) NOT NULL default '',
+  `colorcode` varchar(20) NOT NULL default '',
+  `syndicatedepisodenumber` varchar(20) NOT NULL default '',
+  `programid` varchar(64) NOT NULL default '',
+  `manualid` int(10) unsigned NOT NULL default '0',
+  `generic` tinyint(1) default '0',
+  `listingsource` int(11) NOT NULL default '0',
+  `first` tinyint(1) NOT NULL default '0',
+  `last` tinyint(1) NOT NULL default '0',
+  `audioprop` set('STEREO','MONO','SURROUND','DOLBY','HARDHEAR','VISUALIMPAIR') character set latin1 NOT NULL,
+  `subtitletypes` set('HARDHEAR','NORMAL','ONSCREEN','SIGNED') character set latin1 NOT NULL,
+  `videoprop` set('HDTV','WIDESCREEN','AVC') character set latin1 NOT NULL,
+  PRIMARY KEY  (`chanid`,`starttime`,`manualid`),
+  KEY `endtime` (`endtime`),
+  KEY `title` (`title`),
+  KEY `title_pronounce` (`title_pronounce`),
+  KEY `seriesid` (`seriesid`),
+  KEY `id_start_end` (`chanid`,`starttime`,`endtime`),
+  KEY `program_manualid` (`manualid`),
+  KEY `previouslyshown` (`previouslyshown`),
+  KEY `programid` (`programid`,`starttime`),
+  KEY `starttime` (`starttime`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `program`
+--
+
+LOCK TABLES `program` WRITE;
+/*!40000 ALTER TABLE `program` DISABLE KEYS */;
+/*!40000 ALTER TABLE `program` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `programgenres`
+--
+
+DROP TABLE IF EXISTS `programgenres`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `programgenres` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `relevance` char(1) NOT NULL default '',
+  `genre` varchar(30) default NULL,
+  PRIMARY KEY  (`chanid`,`starttime`,`relevance`),
+  KEY `genre` (`genre`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `programgenres`
+--
+
+LOCK TABLES `programgenres` WRITE;
+/*!40000 ALTER TABLE `programgenres` DISABLE KEYS */;
+/*!40000 ALTER TABLE `programgenres` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `programrating`
+--
+
+DROP TABLE IF EXISTS `programrating`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `programrating` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `system` varchar(8) default NULL,
+  `rating` varchar(16) default NULL,
+  UNIQUE KEY `chanid` (`chanid`,`starttime`,`system`,`rating`),
+  KEY `starttime` (`starttime`,`system`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `programrating`
+--
+
+LOCK TABLES `programrating` WRITE;
+/*!40000 ALTER TABLE `programrating` DISABLE KEYS */;
+/*!40000 ALTER TABLE `programrating` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `recgrouppassword`
+--
+
+DROP TABLE IF EXISTS `recgrouppassword`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `recgrouppassword` (
+  `recgroup` varchar(32) character set utf8 collate utf8_bin NOT NULL default '',
+  `password` varchar(10) NOT NULL default '',
+  PRIMARY KEY  (`recgroup`),
+  UNIQUE KEY `recgroup` (`recgroup`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `recgrouppassword`
+--
+
+LOCK TABLES `recgrouppassword` WRITE;
+/*!40000 ALTER TABLE `recgrouppassword` DISABLE KEYS */;
+/*!40000 ALTER TABLE `recgrouppassword` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `record`
+--
+
+DROP TABLE IF EXISTS `record`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `record` (
+  `recordid` int(10) unsigned NOT NULL auto_increment,
+  `type` int(10) unsigned NOT NULL default '0',
+  `chanid` int(10) unsigned default NULL,
+  `starttime` time NOT NULL default '00:00:00',
+  `startdate` date NOT NULL default '0000-00-00',
+  `endtime` time NOT NULL default '00:00:00',
+  `enddate` date NOT NULL default '0000-00-00',
+  `title` varchar(128) NOT NULL default '',
+  `subtitle` varchar(128) NOT NULL default '',
+  `description` text NOT NULL,
+  `category` varchar(64) NOT NULL default '',
+  `profile` varchar(128) NOT NULL default 'Default',
+  `recpriority` int(10) NOT NULL default '0',
+  `autoexpire` int(11) NOT NULL default '0',
+  `maxepisodes` int(11) NOT NULL default '0',
+  `maxnewest` int(11) NOT NULL default '0',
+  `startoffset` int(11) NOT NULL default '0',
+  `endoffset` int(11) NOT NULL default '0',
+  `recgroup` varchar(32) NOT NULL default 'Default',
+  `dupmethod` int(11) NOT NULL default '6',
+  `dupin` int(11) NOT NULL default '15',
+  `station` varchar(20) NOT NULL default '',
+  `seriesid` varchar(40) NOT NULL default '',
+  `programid` varchar(40) NOT NULL default '',
+  `search` int(10) unsigned NOT NULL default '0',
+  `autotranscode` tinyint(1) NOT NULL default '0',
+  `autocommflag` tinyint(1) NOT NULL default '0',
+  `autouserjob1` tinyint(1) NOT NULL default '0',
+  `autouserjob2` tinyint(1) NOT NULL default '0',
+  `autouserjob3` tinyint(1) NOT NULL default '0',
+  `autouserjob4` tinyint(1) NOT NULL default '0',
+  `findday` tinyint(4) NOT NULL default '0',
+  `findtime` time NOT NULL default '00:00:00',
+  `findid` int(11) NOT NULL default '0',
+  `inactive` tinyint(1) NOT NULL default '0',
+  `parentid` int(11) NOT NULL default '0',
+  `transcoder` int(11) NOT NULL default '0',
+  `tsdefault` float NOT NULL default '1',
+  `playgroup` varchar(32) NOT NULL default 'Default',
+  `prefinput` int(10) NOT NULL default '0',
+  `next_record` datetime NOT NULL,
+  `last_record` datetime NOT NULL,
+  `last_delete` datetime NOT NULL,
+  `storagegroup` varchar(32) NOT NULL default 'Default',
+  `avg_delay` int(11) NOT NULL default '100',
+  PRIMARY KEY  (`recordid`),
+  KEY `chanid` (`chanid`,`starttime`),
+  KEY `title` (`title`),
+  KEY `seriesid` (`seriesid`),
+  KEY `programid` (`programid`),
+  KEY `maxepisodes` (`maxepisodes`),
+  KEY `search` (`search`),
+  KEY `type` (`type`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `record`
+--
+
+LOCK TABLES `record` WRITE;
+/*!40000 ALTER TABLE `record` DISABLE KEYS */;
+/*!40000 ALTER TABLE `record` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `recorded`
+--
+
+DROP TABLE IF EXISTS `recorded`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `recorded` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `endtime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `title` varchar(128) NOT NULL default '',
+  `subtitle` varchar(128) NOT NULL default '',
+  `description` text NOT NULL,
+  `category` varchar(64) NOT NULL default '',
+  `hostname` varchar(64) NOT NULL default '',
+  `bookmark` tinyint(1) NOT NULL default '0',
+  `editing` int(10) unsigned NOT NULL default '0',
+  `cutlist` tinyint(1) NOT NULL default '0',
+  `autoexpire` int(11) NOT NULL default '0',
+  `commflagged` int(10) unsigned NOT NULL default '0',
+  `recgroup` varchar(32) NOT NULL default 'Default',
+  `recordid` int(11) default NULL,
+  `seriesid` varchar(40) NOT NULL default '',
+  `programid` varchar(40) NOT NULL default '',
+  `lastmodified` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  `filesize` bigint(20) NOT NULL default '0',
+  `stars` float NOT NULL default '0',
+  `previouslyshown` tinyint(1) default '0',
+  `originalairdate` date default NULL,
+  `preserve` tinyint(1) NOT NULL default '0',
+  `findid` int(11) NOT NULL default '0',
+  `deletepending` tinyint(1) NOT NULL default '0',
+  `transcoder` int(11) NOT NULL default '0',
+  `timestretch` float NOT NULL default '1',
+  `recpriority` int(11) NOT NULL default '0',
+  `basename` varchar(255) NOT NULL,
+  `progstart` datetime NOT NULL default '0000-00-00 00:00:00',
+  `progend` datetime NOT NULL default '0000-00-00 00:00:00',
+  `playgroup` varchar(32) NOT NULL default 'Default',
+  `profile` varchar(32) NOT NULL default '',
+  `duplicate` tinyint(1) NOT NULL default '0',
+  `transcoded` tinyint(1) NOT NULL default '0',
+  `watched` tinyint(4) NOT NULL default '0',
+  `storagegroup` varchar(32) NOT NULL default 'Default',
+  PRIMARY KEY  (`chanid`,`starttime`),
+  KEY `endtime` (`endtime`),
+  KEY `seriesid` (`seriesid`),
+  KEY `programid` (`programid`),
+  KEY `title` (`title`),
+  KEY `recordid` (`recordid`),
+  KEY `deletepending` (`deletepending`,`lastmodified`),
+  KEY `recgroup` (`recgroup`,`endtime`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `recorded`
+--
+
+LOCK TABLES `recorded` WRITE;
+/*!40000 ALTER TABLE `recorded` DISABLE KEYS */;
+/*!40000 ALTER TABLE `recorded` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `recordedcredits`
+--
+
+DROP TABLE IF EXISTS `recordedcredits`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `recordedcredits` (
+  `person` mediumint(8) unsigned NOT NULL default '0',
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `role` set('actor','director','producer','executive_producer','writer','guest_star','host','adapter','presenter','commentator','guest') character set latin1 NOT NULL default '',
+  UNIQUE KEY `chanid` (`chanid`,`starttime`,`person`,`role`),
+  KEY `person` (`person`,`role`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `recordedcredits`
+--
+
+LOCK TABLES `recordedcredits` WRITE;
+/*!40000 ALTER TABLE `recordedcredits` DISABLE KEYS */;
+/*!40000 ALTER TABLE `recordedcredits` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `recordedfile`
+--
+
+DROP TABLE IF EXISTS `recordedfile`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `recordedfile` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `basename` varchar(128) NOT NULL default '',
+  `filesize` bigint(20) NOT NULL default '0',
+  `width` smallint(5) unsigned NOT NULL default '0',
+  `height` smallint(5) unsigned NOT NULL default '0',
+  `fps` float(6,3) NOT NULL default '0.000',
+  `aspect` float(8,6) NOT NULL default '0.000000',
+  `audio_sample_rate` smallint(5) unsigned NOT NULL default '0',
+  `audio_bits_per_sample` smallint(5) unsigned NOT NULL default '0',
+  `audio_channels` tinyint(3) unsigned NOT NULL default '0',
+  `audio_type` varchar(255) NOT NULL default '',
+  `video_type` varchar(255) NOT NULL default '',
+  `comment` varchar(255) NOT NULL default '',
+  `hostname` varchar(64) NOT NULL,
+  `storagegroup` varchar(32) NOT NULL,
+  `id` int(11) NOT NULL auto_increment,
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `chanid` (`chanid`,`starttime`,`basename`),
+  KEY `basename` (`basename`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `recordedfile`
+--
+
+LOCK TABLES `recordedfile` WRITE;
+/*!40000 ALTER TABLE `recordedfile` DISABLE KEYS */;
+/*!40000 ALTER TABLE `recordedfile` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `recordedmarkup`
+--
+
+DROP TABLE IF EXISTS `recordedmarkup`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `recordedmarkup` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `mark` mediumint(8) unsigned NOT NULL default '0',
+  `type` tinyint(4) NOT NULL default '0',
+  `data` int(11) unsigned default NULL,
+  PRIMARY KEY  (`chanid`,`starttime`,`type`,`mark`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `recordedmarkup`
+--
+
+LOCK TABLES `recordedmarkup` WRITE;
+/*!40000 ALTER TABLE `recordedmarkup` DISABLE KEYS */;
+/*!40000 ALTER TABLE `recordedmarkup` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `recordedprogram`
+--
+
+DROP TABLE IF EXISTS `recordedprogram`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `recordedprogram` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `endtime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `title` varchar(128) NOT NULL default '',
+  `subtitle` varchar(128) NOT NULL default '',
+  `description` text NOT NULL,
+  `category` varchar(64) NOT NULL default '',
+  `category_type` varchar(64) NOT NULL default '',
+  `airdate` year(4) NOT NULL default '0000',
+  `stars` float unsigned NOT NULL default '0',
+  `previouslyshown` tinyint(4) NOT NULL default '0',
+  `title_pronounce` varchar(128) NOT NULL default '',
+  `stereo` tinyint(1) NOT NULL default '0',
+  `subtitled` tinyint(1) NOT NULL default '0',
+  `hdtv` tinyint(1) NOT NULL default '0',
+  `closecaptioned` tinyint(1) NOT NULL default '0',
+  `partnumber` int(11) NOT NULL default '0',
+  `parttotal` int(11) NOT NULL default '0',
+  `seriesid` varchar(40) NOT NULL default '',
+  `originalairdate` date default NULL,
+  `showtype` varchar(30) NOT NULL default '',
+  `colorcode` varchar(20) NOT NULL default '',
+  `syndicatedepisodenumber` varchar(20) NOT NULL default '',
+  `programid` varchar(40) NOT NULL default '',
+  `manualid` int(10) unsigned NOT NULL default '0',
+  `generic` tinyint(1) default '0',
+  `listingsource` int(11) NOT NULL default '0',
+  `first` tinyint(1) NOT NULL default '0',
+  `last` tinyint(1) NOT NULL default '0',
+  `audioprop` set('STEREO','MONO','SURROUND','DOLBY','HARDHEAR','VISUALIMPAIR') character set latin1 NOT NULL,
+  `subtitletypes` set('HARDHEAR','NORMAL','ONSCREEN','SIGNED') character set latin1 NOT NULL,
+  `videoprop` set('HDTV','WIDESCREEN','AVC','720','1080') NOT NULL,
+  PRIMARY KEY  (`chanid`,`starttime`,`manualid`),
+  KEY `endtime` (`endtime`),
+  KEY `title` (`title`),
+  KEY `title_pronounce` (`title_pronounce`),
+  KEY `seriesid` (`seriesid`),
+  KEY `programid` (`programid`),
+  KEY `id_start_end` (`chanid`,`starttime`,`endtime`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `recordedprogram`
+--
+
+LOCK TABLES `recordedprogram` WRITE;
+/*!40000 ALTER TABLE `recordedprogram` DISABLE KEYS */;
+/*!40000 ALTER TABLE `recordedprogram` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `recordedrating`
+--
+
+DROP TABLE IF EXISTS `recordedrating`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `recordedrating` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `system` varchar(8) default NULL,
+  `rating` varchar(16) default NULL,
+  UNIQUE KEY `chanid` (`chanid`,`starttime`,`system`,`rating`),
+  KEY `starttime` (`starttime`,`system`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `recordedrating`
+--
+
+LOCK TABLES `recordedrating` WRITE;
+/*!40000 ALTER TABLE `recordedrating` DISABLE KEYS */;
+/*!40000 ALTER TABLE `recordedrating` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `recordedseek`
+--
+
+DROP TABLE IF EXISTS `recordedseek`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `recordedseek` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `mark` mediumint(8) unsigned NOT NULL default '0',
+  `offset` bigint(20) unsigned NOT NULL,
+  `type` tinyint(4) NOT NULL default '0',
+  PRIMARY KEY  (`chanid`,`starttime`,`type`,`mark`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `recordedseek`
+--
+
+LOCK TABLES `recordedseek` WRITE;
+/*!40000 ALTER TABLE `recordedseek` DISABLE KEYS */;
+/*!40000 ALTER TABLE `recordedseek` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `recordingprofiles`
+--
+
+DROP TABLE IF EXISTS `recordingprofiles`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `recordingprofiles` (
+  `id` int(10) unsigned NOT NULL auto_increment,
+  `name` varchar(128) default NULL,
+  `videocodec` varchar(128) default NULL,
+  `audiocodec` varchar(128) default NULL,
+  `profilegroup` int(10) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`id`),
+  KEY `profilegroup` (`profilegroup`)
+) ENGINE=MyISAM AUTO_INCREMENT=54 DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `recordingprofiles`
+--
+
+LOCK TABLES `recordingprofiles` WRITE;
+/*!40000 ALTER TABLE `recordingprofiles` DISABLE KEYS */;
+INSERT INTO `recordingprofiles` (`id`, `name`, `videocodec`, `audiocodec`, `profilegroup`) VALUES (1,'Default',NULL,NULL,1),(2,'Live TV',NULL,NULL,1),(3,'High Quality',NULL,NULL,1),(4,'Low Quality',NULL,NULL,1),(5,'Default',NULL,NULL,2),(6,'Live TV',NULL,NULL,2),(7,'High Quality',NULL,NULL,2),(8,'Low Quality',NULL,NULL,2),(9,'Default',NULL,NULL,3),(10,'Live TV',NULL,NULL,3),(11,'High Quality',NULL,NULL,3),(12,'Low Quality',NULL,NULL,3),(13,'Default',NULL,NULL,4),(14,'Live TV',NULL,NULL,4),(15,'High Quality',NULL,NULL,4),(16,'Low Quality',NULL,NULL,4),(17,'Default',NULL,NULL,5),(18,'Live TV',NULL,NULL,5),(19,'High Quality',NULL,NULL,5),(20,'Low Quality',NULL,NULL,5),(21,'RTjpeg/MPEG4',NULL,NULL,6),(22,'MPEG2',NULL,NULL,6),(23,'Default',NULL,NULL,8),(24,'Live TV',NULL,NULL,8),(25,'High Quality',NULL,NULL,8),(26,'Low Quality',NULL,NULL,8),(27,'High Quality',NULL,NULL,6),(28,'Medium Quality',NULL,NULL,6),(29,'Low Quality',NULL,NULL,6),(30,'Default',NULL,NULL,10),(31,'Live TV',NULL,NULL,10),(32,'High Quality',NULL,NULL,10),(33,'Low Quality',NULL,NULL,10),(34,'Default',NULL,NULL,11),(35,'Live TV',NULL,NULL,11),(36,'High Quality',NULL,NULL,11),(37,'Low Quality',NULL,NULL,11),(38,'Default',NULL,NULL,12),(39,'Live TV',NULL,NULL,12),(40,'High Quality',NULL,NULL,12),(41,'Low Quality',NULL,NULL,12),(42,'Default',NULL,NULL,7),(43,'Live TV',NULL,NULL,7),(44,'High Quality',NULL,NULL,7),(45,'Low Quality',NULL,NULL,7),(46,'Default',NULL,NULL,9),(47,'Live TV',NULL,NULL,9),(48,'High Quality',NULL,NULL,9),(49,'Low Quality',NULL,NULL,9),(50,'Default',NULL,NULL,13),(51,'Live TV',NULL,NULL,13),(52,'High Quality',NULL,NULL,13),(53,'Low Quality',NULL,NULL,13);
+/*!40000 ALTER TABLE `recordingprofiles` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `recordmatch`
+--
+
+DROP TABLE IF EXISTS `recordmatch`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `recordmatch` (
+  `recordid` int(10) unsigned default NULL,
+  `chanid` int(10) unsigned default NULL,
+  `starttime` datetime default NULL,
+  `manualid` int(10) unsigned default NULL,
+  `oldrecduplicate` tinyint(1) default NULL,
+  `recduplicate` tinyint(1) default NULL,
+  `findduplicate` tinyint(1) default NULL,
+  `oldrecstatus` int(11) default NULL,
+  KEY `recordid` (`recordid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `recordmatch`
+--
+
+LOCK TABLES `recordmatch` WRITE;
+/*!40000 ALTER TABLE `recordmatch` DISABLE KEYS */;
+/*!40000 ALTER TABLE `recordmatch` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `romdb`
+--
+
+DROP TABLE IF EXISTS `romdb`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `romdb` (
+  `crc` varchar(64) NOT NULL default '',
+  `name` varchar(128) NOT NULL default '',
+  `description` varchar(128) NOT NULL default '',
+  `category` varchar(128) NOT NULL default '',
+  `year` varchar(10) NOT NULL default '',
+  `manufacturer` varchar(128) NOT NULL default '',
+  `country` varchar(128) NOT NULL default '',
+  `publisher` varchar(128) NOT NULL default '',
+  `platform` varchar(64) NOT NULL default '',
+  `filesize` int(12) default NULL,
+  `flags` varchar(64) NOT NULL default '',
+  `version` varchar(64) NOT NULL default '',
+  `binfile` varchar(64) NOT NULL default '',
+  KEY `crc` (`crc`),
+  KEY `year` (`year`),
+  KEY `category` (`category`),
+  KEY `name` (`name`),
+  KEY `description` (`description`),
+  KEY `platform` (`platform`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `romdb`
+--
+
+LOCK TABLES `romdb` WRITE;
+/*!40000 ALTER TABLE `romdb` DISABLE KEYS */;
+/*!40000 ALTER TABLE `romdb` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `schemalock`
+--
+
+DROP TABLE IF EXISTS `schemalock`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `schemalock` (
+  `schemalock` int(1) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `schemalock`
+--
+
+LOCK TABLES `schemalock` WRITE;
+/*!40000 ALTER TABLE `schemalock` DISABLE KEYS */;
+/*!40000 ALTER TABLE `schemalock` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `settings`
+--
+
+DROP TABLE IF EXISTS `settings`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `settings` (
+  `value` varchar(128) NOT NULL default '',
+  `data` text,
+  `hostname` varchar(64) default NULL,
+  KEY `value` (`value`,`hostname`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `settings`
+--
+
+LOCK TABLES `settings` WRITE;
+/*!40000 ALTER TABLE `settings` DISABLE KEYS */;
+INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES ('mythfilldatabaseLastRunStart',NULL,NULL),('mythfilldatabaseLastRunEnd',NULL,NULL),('mythfilldatabaseLastRunStatus',NULL,NULL),('DataDirectMessage',NULL,NULL),('HaveRepeats','0',NULL),('DBSchemaVer','1244',NULL),('DefaultTranscoder','0',NULL),('MythFillSuggestedRunTime','1970-01-01T00:00:00',NULL),('MythFillGrabberSuggestsTime','1',NULL),('MythFillFixProgramIDsHasRunOnce','1','larch5'),('Language','EN_US','larch5'),('BackendServerIP','127.0.0.1','larch5'),('BackendServerPort','6543','larch5'),('BackendStatusPort','6544','larch5'),('SecurityPin','','larch5'),('MasterServerIP','127.0.0.1',NULL),('MasterServerPort','6543',NULL),('TVFormat','NTSC',NULL),('VbiFormat','None',NULL),('FreqTable','us-bcast',NULL),('TimeOffset','None',NULL),('MasterBackendOverride','1',NULL),('DeletesFollowLinks','1',NULL),('TruncateDeletesSlowly','0','larch5'),('HDRingbufferSize','9400',NULL),('MiscStatusScript','','larch5'),('DisableFirewireReset','0','larch5'),('EITTransportTimeout','5',NULL),('EITIgnoresSource','0',NULL),('EITCrawIdleStart','60',NULL),('startupCommand','',NULL),('blockSDWUwithoutClient','1',NULL),('idleWaitForRecordingTime','15',NULL),('StartupSecsBeforeRecording','120',NULL),('WakeupTimeFormat','hh:mm yyyy-MM-dd',NULL),('SetWakeuptimeCommand','',NULL),('ServerHaltCommand','sudo /sbin/halt -p',NULL),('preSDWUCheckCommand','',NULL),('WOLbackendConnectRetry','5',NULL),('WOLbackendCommand','',NULL),('WOLslaveBackendsCommand','',NULL),('JobQueueMaxSimultaneousJobs','1','larch5'),('JobQueueCheckFrequency','60','larch5'),('JobQueueWindowStart','00:00','larch5'),('JobQueueWindowEnd','23:59','larch5'),('JobQueueCPU','0','larch5'),('JobAllowCommFlag','1','larch5'),('JobAllowTranscode','1','larch5'),('JobAllowUserJob1','0','larch5'),('JobAllowUserJob2','0','larch5'),('JobAllowUserJob3','0','larch5'),('JobAllowUserJob4','0','larch5'),('JobsRunOnRecordHost','0',NULL),('AutoCommflagWhileRecording','0',NULL),('JobQueueCommFlagCommand','mythcommflag',NULL),('JobQueueTranscodeCommand','mythtranscode',NULL),('AutoTranscodeBeforeAutoCommflag','0',NULL),('SaveTranscoding','0',NULL),('UserJobDesc1','User Job #1',NULL),('UserJob1','',NULL),('UserJobDesc2','User Job #2',NULL),('UserJob2','',NULL),('UserJobDesc3','User Job #3',NULL),('UserJob3','',NULL),('UserJobDesc4','User Job #4',NULL),('UserJob4','',NULL),('DefaultVideoPlaybackProfile','CPU+','larch5'),('RealtimePriority','1','larch5'),('DecodeExtraAudio','1','larch5'),('AudioNag','1','larch5'),('UseVideoTimebase','0','larch5'),('ClearSavedPosition','1','larch5'),('AltClearSavedPosition','1','larch5'),('JumpToProgramOSD','1','larch5'),('ContinueEmbeddedTVPlay','0','larch5'),('AutomaticSetWatched','0','larch5'),('AlwaysStreamFiles','1','larch5'),('UseOpenGLVSync','0','larch5'),('UseOutputPictureControls','1','larch5'),('AspectOverride','0','larch5'),('AdjustFill','0','larch5'),('LetterboxColour','0','larch5'),('PIPLocation','0','larch5'),('PlaybackExitPrompt','2','larch5'),('EndOfRecordingExitPrompt','1','larch5'),('PlayBoxOrdering','1','larch5'),('PlayBoxEpisodeSort','Date','larch5'),('GeneratePreviewPixmaps','0','larch5'),('PreviewPixmapOffset','64',NULL),('PreviewFromBookmark','1','larch5'),('PlaybackPreview','1','larch5'),('PlaybackBoxStartInTitle','1','larch5'),('ShowGroupInfo','0','larch5'),('AllRecGroupPassword','',NULL),('DisplayRecGroup','All Programs','larch5'),('QueryInitialFilter','0','larch5'),('RememberRecGroup','1','larch5'),('DispRecGroupAsAllProg','0','larch5'),('LiveTVInAllPrograms','0','larch5'),('DisplayGroupDefaultView','0','larch5'),('DisplayGroupTitleSort','0','larch5'),('PlaybackWatchList','1','larch5'),('PlaybackWLStart','0','larch5'),('PlaybackWLAutoExpire','0','larch5'),('PlaybackWLMaxAge','60','larch5'),('PlaybackWLBlackOut','2','larch5'),('SmartForward','0','larch5'),('StickyKeys','0','larch5'),('FFRewReposTime','100','larch5'),('FFRewReverse','1','larch5'),('ExactSeeking','0','larch5'),('AutoCommercialSkip','0','larch5'),('MaximumCommercialSkip','3600',NULL),('CommSkipAllBlanks','1',NULL),('PVR350OutputEnable','0','larch5'),('PVR350EPGAlphaValue','164','larch5'),('PVR350InternalAudioOnly','0','larch5'),('OSDTheme','blueosd','larch5'),('OSDGeneralTimeout','2','larch5'),('OSDProgramInfoTimeout','3','larch5'),('OSDFont','FreeMono.ttf','larch5'),('OSDThemeFontSizeType','default','larch5'),('EnableMHEG','0','larch5'),('PersistentBrowseMode','1','larch5'),('OSDNotifyTimeout','5','larch5'),('UDPNotifyPort','6948','larch5'),('OSDCCFont','FreeMono.ttf','larch5'),('CCBackground','0','larch5'),('DefaultCCMode','0','larch5'),('Prefer708Captions','1','larch5'),('OSDCC708TextZoom','100','larch5'),('[REDACTED]','MonoSerif','larch5'),('OSDCC708MonoSerifFont','FreeMono.ttf','larch5'),('OSDCC708PropSerifFont','FreeMono.ttf','larch5'),('OSDCC708MonoSansSerifFont','FreeMono.ttf','larch5'),('OSDCC708PropSansSerifFont','FreeMono.ttf','larch5'),('OSDCC708CasualFont','FreeMono.ttf','larch5'),('OSDCC708CursiveFont','FreeMono.ttf','larch5'),('OSDCC708CapitalsFont','FreeMono.ttf','larch5'),('OSDCC708MonoSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708PropSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708MonoSansSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708PropSansSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708CasualItalicFont','FreeMono.ttf','larch5'),('OSDCC708CursiveItalicFont','FreeMono.ttf','larch5'),('OSDCC708CapitalsItalicFont','FreeMono.ttf','larch5'),('ChannelOrdering','channum','larch5'),('ChannelFormat','<num> <sign>','larch5'),('LongChannelFormat','<num> <name>','larch5'),('SmartChannelChange','0','larch5'),('LastFreeCard','0',NULL),('LiveTVPriority','0',NULL),('AutoExpireMethod','2',NULL),('AutoExpireDefault','1',NULL),('RerecordWatched','1',NULL),('AutoExpireWatchedPriority','0',NULL),('AutoExpireLiveTVMaxAge','1',NULL),('AutoExpireDayPriority','3',NULL),('AutoExpireExtraSpace','1',NULL),('AutoExpireInsteadOfDelete','0',NULL),('DeletedFifoOrder','0',NULL),('CommercialSkipMethod','7',NULL),('AggressiveCommDetect','1',NULL),('AutoCommercialFlag','1',NULL),('AutoTranscode','0',NULL),('AutoRunUserJob1','0',NULL),('AutoRunUserJob2','0',NULL),('AutoRunUserJob3','0',NULL),('AutoRunUserJob4','0',NULL),('OverTimeCategory','category name',NULL),('CategoryOverTime','30',NULL),('EPGFillType','12','larch5'),('EPGShowCategoryColors','1','larch5'),('EPGShowCategoryText','1','larch5'),('EPGScrollType','1','larch5'),('EPGShowChannelIcon','1','larch5'),('EPGShowFavorites','0','larch5'),('WatchTVGuide','0','larch5'),('chanPerPage','5','larch5'),('timePerPage','4','larch5'),('UnknownTitle','Unknown','larch5'),('UnknownCategory','Unknown','larch5'),('DefaultTVChannel','3','larch5'),('SelectChangesChannel','0','larch5'),('SelChangeRecThreshold','16','larch5'),('EPGEnableJumpToChannel','0',NULL),('Theme','LinHES','larch5'),('RandomTheme','0','larch5'),('ThemeCacheSize','1','larch5'),('ThemePainter','qt','larch5'),('Style','Desktop Style','larch5'),('ThemeFontSizeType','default','larch5'),('MenuTheme','default','larch5'),('XineramaScreen','0','larch5'),('XineramaMonitorAspectRatio','1.3333','larch5'),('GuiSizeForTV','1','larch5'),('HideMouseCursor','1','larch5'),('RunFrontendInWindow','0','larch5'),('UseVideoModes','0','larch5'),('GuiVidModeResolution','640x480','larch5'),('TVVidModeResolution','320x200','larch5'),('TVVidModeForceAspect','0.0','larch5'),('TVVidModeResolution0','320x200','larch5'),('TVVidModeForceAspect0','0.0','larch5'),('TVVidModeResolution1','320x200','larch5'),('TVVidModeForceAspect1','0.0','larch5'),('TVVidModeResolution2','320x200','larch5'),('TVVidModeForceAspect2','0.0','larch5'),('ISO639Language0','eng','larch5'),('ISO639Language1','eng','larch5'),('DateFormat','ddd MMM d','larch5'),('ShortDateFormat','M/d','larch5'),('TimeFormat','h:mm AP','larch5'),('QtFontSmall','12','larch5'),('QtFontMedium','16','larch5'),('QtFontBig','25','larch5'),('PlayBoxTransparency','1','larch5'),('PlayBoxShading','0','larch5'),('UseVirtualKeyboard','1','larch5'),('LCDEnable','0','larch5'),('LCDShowTime','1','larch5'),('LCDShowMenu','1','larch5'),('LCDShowMusic','1','larch5'),('LCDShowMusicItems','ArtistTitle','larch5'),('LCDShowChannel','1','larch5'),('LCDShowRecStatus','0','larch5'),('LCDShowVolume','1','larch5'),('LCDShowGeneric','1','larch5'),('LCDBacklightOn','1','larch5'),('LCDHeartBeatOn','0','larch5'),('LCDBigClock','0','larch5'),('LCDKeyString','ABCDEF','larch5'),('LCDPopupTime','5','larch5'),('AudioOutputDevice','ALSA:default','larch5'),('PassThruOutputDevice','Default','larch5'),('MaxChannels','2','larch5'),('AudioUpmixType','0','larch5'),('AC3PassThru','0','larch5'),('DTSPassThru','0','larch5'),('AggressiveSoundcardBuffer','0','larch5'),('MythControlsVolume','1','larch5'),('MixerDevice','ALSA:default','larch5'),('MixerControl','PCM','larch5'),('MasterMixerVolume','100','larch5'),('PCMMixerVolume','50','larch5'),('IndividualMuteControl','0','larch5'),('LircKeyPressedApp','','larch5'),('AllowQuitShutdown','4','larch5'),('NoPromptOnExit','1','larch5'),('UseArrowAccels','1','larch5'),('NetworkControlEnabled','0','larch5'),('NetworkControlPort','6546','larch5'),('MonitorDrives','0','larch5'),('MediaChangeEvents','0','larch5'),('IgnoreDevices','','larch5'),('SetupPinCodeRequired','0','larch5'),('OverrideExitMenu','3','larch5'),('HaltCommand','sudo /sbin/halt','larch5'),('RebootCommand','sudo /sbin/reboot','larch5'),('EnableXbox','0','larch5'),('LogEnabled','0',NULL),('LogMaxCount','100','larch5'),('LogPrintLevel','8','larch5'),('LogCleanEnabled','0','larch5'),('LogCleanPeriod','14','larch5'),('LogCleanDays','14','larch5'),('LogCleanMax','30','larch5'),('MythFillEnabled','1',NULL),('MythFillDatabasePath','mythfilldatabase',NULL),('MythFillDatabaseArgs','',NULL),('MythFillDatabaseLog','',NULL),('MythFillPeriod','1',NULL),('MythFillMinHour','2',NULL),('MythFillMaxHour','5',NULL),('SchedMoveHigher','1',NULL),('SchedOpenEnd','0',NULL),('ComplexPriority','0',NULL),('PrefInputPriority','2',NULL),('SingleRecordRecPriority','1',NULL),('FindOneRecordRecPriority','-1',NULL),('ArchiveDBSchemaVer','1005',NULL),('MythArchiveTempDir','/myth/tmp','larch5'),('MythArchiveShareDir','/usr/share/mythtv/mytharchive/','larch5'),('MythArchiveVideoFormat','NTSC','larch5'),('MythArchiveFileFilter','*.mpg *.mov *.avi *.mpeg *.nuv','larch5'),('MythArchiveDVDLocation','/dev/dvd','larch5'),('MythArchiveDVDPlayerCmd','Internal','larch5'),('MythArchiveEncodeToAc3','0','larch5'),('MythArchiveCopyRemoteFiles','0','larch5'),('MythArchiveAlwaysUseMythTranscode','1','larch5'),('MythArchiveUseProjectX','0','larch5'),('MythArchiveAddSubtitles','0','larch5'),('MythArchiveUseFIFO','1','larch5'),('MythArchiveDefaultEncProfile','SP','larch5'),('MythArchiveMainMenuAR','16:9','larch5'),('MythArchiveChapterMenuAR','Video','larch5'),('MythArchiveDateFormat','%a  %b  %d','larch5'),('MythArchiveTimeFormat','%I:%M %p','larch5'),('MythArchiveFfmpegCmd','ffmpeg','larch5'),('MythArchiveMplexCmd','mplex','larch5'),('MythArchiveDvdauthorCmd','dvdauthor','larch5'),('MythArchiveSpumuxCmd','spumux','larch5'),('MythArchiveMpeg2encCmd','mpeg2enc','larch5'),('MythArchiveMkisofsCmd','mkisofs','larch5'),('MythArchiveGrowisofsCmd','growisofs','larch5'),('MythArchiveTcrequantCmd','tcrequant','larch5'),('MythArchiveJpeg2yuvCmd','jpeg2yuv','larch5'),('MythArchiveProjectXCmd','projectx','larch5'),('FlixDBSchemaVer','1004',NULL),('GalleryDBSchemaVer','1003',NULL),('GalleryDir','/myth/gallery','larch5'),('GalleryThumbnailLocation','1','larch5'),('GallerySortOrder','20','larch5'),('GalleryImportDirs','/mnt/cdrom:/mnt/camera','larch5'),('GalleryMoviePlayerCmd','mplayer -fs %s','larch5'),('SlideshowUseOpenGL','0','larch5'),('SlideshowDelay','5','larch5'),('SlideshowOpenGLTransition','none','larch5'),('SlideshowOpenGLTransitionLength','2000','larch5'),('SlideshowTransition','random','larch5'),('SlideshowBackground','black','larch5'),('GameDBSchemaVer','1016',NULL),('MusicDBSchemaVer','1017',NULL),('VisualMode','','larch5'),('MusicLocation','/myth/music/','larch5'),('MusicAudioDevice','default','larch5'),('CDDevice','/dev/cdrom','larch5'),('AutoLookupCD','1','larch5'),('AutoPlayCD','0','larch5'),('KeyboardAccelerators','1','larch5'),('TreeLevels','splitartist artist album title','larch5'),('ArtistTreeGroups','0','larch5'),('NonID3FileNameFormat','GENRE/ARTIST/ALBUM/TRACK_TITLE','larch5'),('Ignore_ID3','0','larch5'),('MusicTagEncoding','utf16','larch5'),('CDWriterEnabled','1','larch5'),('CDDiskSize','1','larch5'),('CDCreateDir','1','larch5'),('CDWriteSpeed','0','larch5'),('CDBlankType','fast','larch5'),('PlayMode','none','larch5'),('ResumeMode','off','larch5'),('MaxSearchResults','300','larch5'),('MusicShowRatings','0','larch5'),('ShowWholeTree','0','larch5'),('ListAsShuffled','0','larch5'),('IntelliRatingWeight','35','larch5'),('IntelliPlayCountWeight','25','larch5'),('IntelliLastPlayWeight','25','larch5'),('IntelliRandomWeight','15','larch5'),('VisualCycleOnSongChange','0','larch5'),('VisualAlbumArtOnSongChange','0','larch5'),('VisualRandomize','0','larch5'),('VisualModeDelay','0','larch5'),('VisualScaleWidth','1','larch5'),('VisualScaleHeight','1','larch5'),('ParanoiaLevel','Full','larch5'),('FilenameTemplate','ARTIST/ALBUM/TRACK-TITLE','larch5'),('NoWhitespace','0','larch5'),('PostCDRipScript','','larch5'),('EjectCDAfterRipping','1','larch5'),('EncoderType','ogg','larch5'),('DefaultRipQuality','1','larch5'),('Mp3UseVBR','0','larch5'),('PhoneDBSchemaVer','1001',NULL),('SipRegisterWithProxy','1','larch5'),('SipProxyName','fwd.pulver.com','larch5'),('SipProxyAuthName','','larch5'),('SipProxyAuthPassword','','larch5'),('MySipName','Me','larch5'),('SipAutoanswer','0','larch5'),('SipBindInterface','eth0','larch5'),('SipLocalPort','5060','larch5'),('NatTraversalMethod','None','larch5'),('NatIpAddress','http://checkip.dyndns.org','larch5'),('AudioLocalPort','21232','larch5'),('VideoLocalPort','21234','larch5'),('MicrophoneDevice','None','larch5'),('CodecPriorityList','GSM;G.711u;G.711a','larch5'),('PlayoutAudioCall','40','larch5'),('PlayoutVideoCall','110','larch5'),('TxResolution','176x144','larch5'),('TransmitFPS','5','larch5'),('TransmitBandwidth','256','larch5'),('CaptureResolution','352x288','larch5'),('TimeToAnswer','10','larch5'),('DefaultVxmlUrl','http://127.0.0.1/vxml/index.vxml','larch5'),('DefaultVoicemailPrompt','I am not at home, please leave a message after the tone','larch5'),('mythvideo.DBSchemaVer','1028',NULL),('VideoStartupDir','/myth/video','larch5'),('VideoArtworkDir','/myth/video_stuff/coverart','larch5'),('Default MythVideo View','2','larch5'),('VideoListUnknownFiletypes','1','larch5'),('VideoBrowserNoDB','1','larch5'),('VideoGalleryNoDB','1','larch5'),('VideoTreeNoDB','1','larch5'),('VideoTreeLoadMetaData','1','larch5'),('VideoNewBrowsable','1','larch5'),('mythvideo.sort_ignores_case','1','larch5'),('mythvideo.db_folder_view','1','larch5'),('mythvideo.VideoTreeRemember','1','larch5'),('mythvideo.ImageCacheSize','50','larch5'),('DVDDeviceLocation','/dev/dvd','larch5'),('VCDDeviceLocation','/dev/cdrom','larch5'),('DVDOnInsertDVD','1','larch5'),('DVDDriveSpeed','2','larch5'),('EnableDVDBookmark','1','larch5'),('DVDBookmarkPrompt','1','larch5'),('DVDBookmarkDays','10','larch5'),('mythvideo.fanartDir','/myth/video_stuff/fanart','larch5'),('mythvideo.screenshotDir','/myth/video_stuff/screenshots','larch5'),('mythvideo.bannerDir','/myth/video_stuff/banners','larch5'),('VideoGalleryColsPerPage','4','larch5'),('VideoGalleryRowsPerPage','3','larch5'),('VideoGallerySubtitle','1','larch5'),('VideoDefaultParentalLevel','4','larch5'),('VideoAggressivePC','0','larch5'),('mythvideo.ParentalLevelFromRating','0','larch5'),('mythvideo.AutoR2PL1','G','larch5'),('mythvideo.AutoR2PL2','PG','larch5'),('mythvideo.AutoR2PL3','PG-13','larch5'),('mythvideo.AutoR2PL4','R:NC-17','larch5'),('VideoDefaultPlayer','mplayer -fs -zoom -quiet -vo xv %s','larch5'),('mythdvd.DVDPlayerCommand','Internal','larch5'),('VCDPlayerCommand','mplayer vcd:// -cdrom-device %d -fs -zoom -vo xv','larch5'),('DVDRipLocation','/myth/tmp','larch5'),('TitlePlayCommand','mplayer dvd://%t -dvd-device %d -fs -zoom -vo xv -aid %a -channels %c','larch5'),('SubTitleCommand','-sid %s','larch5'),('TranscodeCommand','transcode','larch5'),('MTDPort','2442','larch5'),('MTDNiceLevel','20','larch5'),('MTDConcurrentTranscodes','1','larch5'),('MTDLogFlag','0','larch5'),('MTDac3Flag','0','larch5'),('MTDxvidFlag','1','larch5'),('mythvideo.TrustTranscodeFRDetect','1','larch5'),('WeatherDBSchemaVer','1004',NULL),('TVVidModeRefreshRate','0','larch5'),('TVVidModeRefreshRate0','0','larch5'),('TVVidModeRefreshRate1','0','larch5'),('TVVidModeRefreshRate2','0','larch5'),('GalleryRecursiveSlideshow','1','larch5'),('WebBrowserZoomLevel','20','larch5'),('WebBrowserCommand','Internal','larch5'),('WebBrowserScrollMode','1','larch5'),('WebBrowserScrollSpeed','4','larch5'),('WebBrowserHideScrollbars','0','larch5'),('RepeatMode','all','larch5'),('MusicAutoShowPlayer','1','larch5'),('HOSTOSsize','5','larch5'),('HostMyhostname','type_hostname_here','larch5'),('NetworkControlEnabled','1','larch5'),('Hostpluginmytharchive','1','larch5'),('Hostpluginmythbrowser','1','larch5'),('Hostpluginmythcontrols','1','larch5'),('Hostpluginmythflix','1','larch5'),('Hostpluginmythgallery','1','larch5'),('Hostpluginmythgame','1','larch5'),('HostpluginmythgameFceu','1','larch5'),('HostpluginmythgameMame','1','larch5'),('HostpluginmythgameZsnes','1','larch5'),('Hostpluginmythmovietime','1','larch5'),('Hostpluginmythmusic','1','larch5'),('Hostpluginmythnews','1','larch5'),('Hostpluginmythphone','1','larch5'),('Hostpluginmythsmolt','1','larch5'),('Hostpluginmythvideo','1','larch5'),('Hostpluginmythvideo_dvdcss','0','larch5'),('Hostpluginmythweather','1','larch5'),('HostAudiotype','ALSA','larch5'),('HostpluginmythgameZsnes','1','larch5'),('HostpluginmythgameMame','1','larch5'),('Hostpluginmythvideo_dvdcss','0','larch5'),('Hostpluginmythappletrailers','1','larch5'),('Hostpluginmythstream','1','larch5'),('Hostpluginmythvodka','1','larch5'),('HostMiro','1','larch5'),('HostpluginmythgameXE','1','larch5'),('HostpluginmythgameROMDB','1','larch5'),('HostXine','1','larch5'),('HOSTOSsize','5','larch5'),('HostMyhostname','type_hostname_here','larch5'),('NetworkControlEnabled','1','larch5'),('Hostaccessuser','1','larch5'),('WOLbackendReconnectWaitTime','5',NULL),('Hostbootsplash','1','larch5'),('HostIPeth0','192.168.1.8','larch5'),('HostNETMASKeth0','/24    255.255.255.0','larch5'),('HostGWeth0','192.168.1.254','larch5'),('HostDNSeth0','192.168.1.254','larch5'),('HostReceiverType','Hauppauge','larch5'),('HostRemoteType','hauppauge-grey','larch5'),('HOSTtemplatetype','Do Nothing','larch5'),('BackupDBLastRunStart','2010-01-18 05:29:21',NULL),('BackupDBLastRunEnd','2010-01-18 05:29:21',NULL),('StorageScheduler','Combination',NULL),('DisableAutomaticBackup','0',NULL),('BackendStopCommand','sudo sv stop mythbackend',NULL),('BackendStartCommand','sudo sv start mythbackend',NULL),('UPnP/WMPSource','0',NULL),('UPnP/RebuildDelay','30','larch5'),('GeneratePreviewRemotely','0','larch5'),('HWAccelPlaybackPreview','0','larch5'),('BrowseAllTuners','0','larch5'),('SubtitleCodec','UTF-8','larch5'),('ChannelGroupRememberLast','0','larch5'),('ChannelGroupDefault','-1','larch5'),('BrowseChannelGroup','0','larch5'),('UseFixedWindowSize','1','larch5'),('ScreenShotPath','/myth/video_stuff/screenshots','larch5'),('LircSocket','/dev/lircd','larch5'),('BrowserDBSchemaVer','1002',NULL),('CDWriterDevice','default','larch5'),('MusicExitAction','prompt','larch5'),('mythvideo.db_group_view','1','larch5'),('mythvideo.db_group_type','0','larch5'),('MovieListCommandLine','/usr/share/mythtv/mythvideo/scripts/tmdb.pl -M','larch5'),('MoviePosterCommandLine','/usr/share/mythtv/mythvideo/scripts/tmdb.pl -P','larch5'),('MovieFanartCommandLine','/usr/share/mythtv/mythvideo/scripts/tmdb.pl -B','larch5'),('MovieDataCommandLine','/usr/share/mythtv/mythvideo/scripts/tmdb.pl -D','larch5'),('mythvideo.TrailersDir','/myth/video_stuff/trailers','larch5'),('mythvideo.TrailersRandomEnabled','1','larch5'),('mythvideo.TrailersRandomCount','3','larch5'),('mythvideo.TVListCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -M','larch5'),('mythvideo.TVPosterCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -P','larch5'),('mythvideo.TVFanartCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -F','larch5'),('mythvideo.TVBannerCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -B','larch5'),('mythvideo.TVDataCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -D','larch5'),('mythvideo.TVTitleSubCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -N','larch5'),('mythvideo.TVScreenshotCommandLine','/usr/share/mythtv/mythvideo/scripts/ttvdb.py -S','larch5'),('mythvideo.EnableAlternatePlayer','1','larch5'),('mythvideo.VideoAlternatePlayer','Internal','larch5');
+/*!40000 ALTER TABLE `settings` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `storagegroup`
+--
+
+DROP TABLE IF EXISTS `storagegroup`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `storagegroup` (
+  `id` int(11) NOT NULL auto_increment,
+  `groupname` varchar(32) NOT NULL,
+  `hostname` varchar(64) NOT NULL default '',
+  `dirname` varchar(235) character set utf8 collate utf8_bin NOT NULL default '',
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `grouphostdir` (`groupname`,`hostname`,`dirname`),
+  KEY `hostname` (`hostname`)
+) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `storagegroup`
+--
+
+LOCK TABLES `storagegroup` WRITE;
+/*!40000 ALTER TABLE `storagegroup` DISABLE KEYS */;
+INSERT INTO `storagegroup` (`id`, `groupname`, `hostname`, `dirname`) VALUES (1,'Default','larch5','/myth/tv/');
+/*!40000 ALTER TABLE `storagegroup` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `tvchain`
+--
+
+DROP TABLE IF EXISTS `tvchain`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `tvchain` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `chainid` varchar(128) NOT NULL default '',
+  `chainpos` int(10) NOT NULL default '0',
+  `discontinuity` tinyint(1) NOT NULL default '0',
+  `watching` int(10) NOT NULL default '0',
+  `hostprefix` varchar(128) NOT NULL default '',
+  `cardtype` varchar(32) NOT NULL default 'V4L',
+  `input` varchar(32) NOT NULL default '',
+  `channame` varchar(32) NOT NULL default '',
+  `endtime` datetime NOT NULL default '0000-00-00 00:00:00',
+  PRIMARY KEY  (`chanid`,`starttime`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `tvchain`
+--
+
+LOCK TABLES `tvchain` WRITE;
+/*!40000 ALTER TABLE `tvchain` DISABLE KEYS */;
+/*!40000 ALTER TABLE `tvchain` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `tvosdmenu`
+--
+
+DROP TABLE IF EXISTS `tvosdmenu`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `tvosdmenu` (
+  `osdcategory` varchar(32) NOT NULL,
+  `livetv` tinyint(4) NOT NULL default '0',
+  `recorded` tinyint(4) NOT NULL default '0',
+  `video` tinyint(4) NOT NULL default '0',
+  `dvd` tinyint(4) NOT NULL default '0',
+  `description` varchar(32) NOT NULL,
+  PRIMARY KEY  (`osdcategory`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `tvosdmenu`
+--
+
+LOCK TABLES `tvosdmenu` WRITE;
+/*!40000 ALTER TABLE `tvosdmenu` DISABLE KEYS */;
+/*!40000 ALTER TABLE `tvosdmenu` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `upnpmedia`
+--
+
+DROP TABLE IF EXISTS `upnpmedia`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `upnpmedia` (
+  `intid` int(10) unsigned NOT NULL default '0',
+  `class` varchar(64) NOT NULL default '',
+  `itemtype` varchar(128) NOT NULL default '',
+  `parentid` int(10) unsigned NOT NULL default '0',
+  `itemproperties` varchar(255) NOT NULL default '',
+  `filepath` varchar(512) NOT NULL default '',
+  `title` varchar(255) NOT NULL default '',
+  `filename` varchar(512) NOT NULL default '',
+  `coverart` varchar(512) NOT NULL default '',
+  PRIMARY KEY  (`intid`),
+  KEY `class` (`class`),
+  KEY `filepath` (`filepath`(333)),
+  KEY `parentid` (`parentid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `upnpmedia`
+--
+
+LOCK TABLES `upnpmedia` WRITE;
+/*!40000 ALTER TABLE `upnpmedia` DISABLE KEYS */;
+/*!40000 ALTER TABLE `upnpmedia` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `videocast`
+--
+
+DROP TABLE IF EXISTS `videocast`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `videocast` (
+  `intid` int(10) unsigned NOT NULL auto_increment,
+  `cast` varchar(128) NOT NULL,
+  PRIMARY KEY  (`intid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `videocast`
+--
+
+LOCK TABLES `videocast` WRITE;
+/*!40000 ALTER TABLE `videocast` DISABLE KEYS */;
+/*!40000 ALTER TABLE `videocast` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `videocategory`
+--
+
+DROP TABLE IF EXISTS `videocategory`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `videocategory` (
+  `intid` int(10) unsigned NOT NULL auto_increment,
+  `category` varchar(128) NOT NULL,
+  PRIMARY KEY  (`intid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `videocategory`
+--
+
+LOCK TABLES `videocategory` WRITE;
+/*!40000 ALTER TABLE `videocategory` DISABLE KEYS */;
+/*!40000 ALTER TABLE `videocategory` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `videocountry`
+--
+
+DROP TABLE IF EXISTS `videocountry`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `videocountry` (
+  `intid` int(10) unsigned NOT NULL auto_increment,
+  `country` varchar(128) NOT NULL,
+  PRIMARY KEY  (`intid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `videocountry`
+--
+
+LOCK TABLES `videocountry` WRITE;
+/*!40000 ALTER TABLE `videocountry` DISABLE KEYS */;
+/*!40000 ALTER TABLE `videocountry` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `videogenre`
+--
+
+DROP TABLE IF EXISTS `videogenre`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `videogenre` (
+  `intid` int(10) unsigned NOT NULL auto_increment,
+  `genre` varchar(128) NOT NULL,
+  PRIMARY KEY  (`intid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `videogenre`
+--
+
+LOCK TABLES `videogenre` WRITE;
+/*!40000 ALTER TABLE `videogenre` DISABLE KEYS */;
+/*!40000 ALTER TABLE `videogenre` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `videometadata`
+--
+
+DROP TABLE IF EXISTS `videometadata`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `videometadata` (
+  `intid` int(10) unsigned NOT NULL auto_increment,
+  `title` varchar(128) NOT NULL,
+  `subtitle` text NOT NULL,
+  `director` varchar(128) NOT NULL,
+  `plot` text,
+  `rating` varchar(128) NOT NULL,
+  `inetref` varchar(255) NOT NULL,
+  `year` int(10) unsigned NOT NULL,
+  `userrating` float NOT NULL,
+  `length` int(10) unsigned NOT NULL,
+  `season` smallint(5) unsigned NOT NULL default '0',
+  `episode` smallint(5) unsigned NOT NULL default '0',
+  `showlevel` int(10) unsigned NOT NULL,
+  `filename` text NOT NULL,
+  `coverfile` text NOT NULL,
+  `childid` int(11) NOT NULL default '-1',
+  `browse` tinyint(1) NOT NULL default '1',
+  `watched` tinyint(1) NOT NULL default '0',
+  `playcommand` varchar(255) default NULL,
+  `category` int(10) unsigned NOT NULL default '0',
+  `trailer` text,
+  `host` text NOT NULL,
+  `screenshot` text,
+  `banner` text,
+  `fanart` text,
+  `insertdate` timestamp NULL default CURRENT_TIMESTAMP,
+  PRIMARY KEY  (`intid`),
+  KEY `director` (`director`),
+  KEY `title` (`title`),
+  KEY `title_2` (`title`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `videometadata`
+--
+
+LOCK TABLES `videometadata` WRITE;
+/*!40000 ALTER TABLE `videometadata` DISABLE KEYS */;
+/*!40000 ALTER TABLE `videometadata` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `videometadatacast`
+--
+
+DROP TABLE IF EXISTS `videometadatacast`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `videometadatacast` (
+  `idvideo` int(10) unsigned NOT NULL,
+  `idcast` int(10) unsigned NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `videometadatacast`
+--
+
+LOCK TABLES `videometadatacast` WRITE;
+/*!40000 ALTER TABLE `videometadatacast` DISABLE KEYS */;
+/*!40000 ALTER TABLE `videometadatacast` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `videometadatacountry`
+--
+
+DROP TABLE IF EXISTS `videometadatacountry`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `videometadatacountry` (
+  `idvideo` int(10) unsigned NOT NULL,
+  `idcountry` int(10) unsigned NOT NULL,
+  KEY `idvideo` (`idvideo`),
+  KEY `idcountry` (`idcountry`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `videometadatacountry`
+--
+
+LOCK TABLES `videometadatacountry` WRITE;
+/*!40000 ALTER TABLE `videometadatacountry` DISABLE KEYS */;
+/*!40000 ALTER TABLE `videometadatacountry` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `videometadatagenre`
+--
+
+DROP TABLE IF EXISTS `videometadatagenre`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `videometadatagenre` (
+  `idvideo` int(10) unsigned NOT NULL,
+  `idgenre` int(10) unsigned NOT NULL,
+  KEY `idvideo` (`idvideo`),
+  KEY `idgenre` (`idgenre`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `videometadatagenre`
+--
+
+LOCK TABLES `videometadatagenre` WRITE;
+/*!40000 ALTER TABLE `videometadatagenre` DISABLE KEYS */;
+/*!40000 ALTER TABLE `videometadatagenre` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `videosource`
+--
+
+DROP TABLE IF EXISTS `videosource`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `videosource` (
+  `sourceid` int(10) unsigned NOT NULL auto_increment,
+  `name` varchar(128) NOT NULL default '',
+  `xmltvgrabber` varchar(128) default NULL,
+  `userid` varchar(128) NOT NULL default '',
+  `freqtable` varchar(16) NOT NULL default 'default',
+  `lineupid` varchar(64) default NULL,
+  `password` varchar(64) default NULL,
+  `useeit` smallint(6) NOT NULL default '0',
+  `configpath` varchar(4096) default NULL,
+  PRIMARY KEY  (`sourceid`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `videosource`
+--
+
+LOCK TABLES `videosource` WRITE;
+/*!40000 ALTER TABLE `videosource` DISABLE KEYS */;
+/*!40000 ALTER TABLE `videosource` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `videotypes`
+--
+
+DROP TABLE IF EXISTS `videotypes`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `videotypes` (
+  `intid` int(10) unsigned NOT NULL auto_increment,
+  `extension` varchar(128) NOT NULL,
+  `playcommand` varchar(255) NOT NULL,
+  `f_ignore` tinyint(1) default NULL,
+  `use_default` tinyint(1) default NULL,
+  PRIMARY KEY  (`intid`)
+) ENGINE=MyISAM AUTO_INCREMENT=23 DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `videotypes`
+--
+
+LOCK TABLES `videotypes` WRITE;
+/*!40000 ALTER TABLE `videotypes` DISABLE KEYS */;
+INSERT INTO `videotypes` (`intid`, `extension`, `playcommand`, `f_ignore`, `use_default`) VALUES (1,'txt','',1,0),(2,'log','',1,0),(3,'mpg','Internal',0,0),(4,'avi','',0,1),(5,'vob','Internal',0,0),(6,'mpeg','Internal',0,0),(7,'VIDEO_TS','Internal',0,0),(8,'iso','Internal',0,0),(9,'img','Internal',0,0),(10,'mkv','Internal',0,1),(11,'mp4','Internal',0,0),(12,'m2ts','Internal',0,0),(13,'evo','Internal',0,0),(14,'divx','Internal',0,0),(15,'mov','Internal',0,0),(16,'qt','Internal',0,0),(17,'wmv','Internal',0,0),(18,'3gp','Internal',0,0),(19,'asf','Internal',0,0),(20,'ogg','Internal',0,0),(21,'ogm','Internal',0,0),(22,'flv','Internal',0,0);
+/*!40000 ALTER TABLE `videotypes` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `weatherdatalayout`
+--
+
+DROP TABLE IF EXISTS `weatherdatalayout`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `weatherdatalayout` (
+  `location` varchar(64) NOT NULL,
+  `dataitem` varchar(64) NOT NULL,
+  `weatherscreens_screen_id` int(10) unsigned NOT NULL,
+  `weathersourcesettings_sourceid` int(10) unsigned NOT NULL,
+  PRIMARY KEY  (`location`,`dataitem`,`weatherscreens_screen_id`,`weathersourcesettings_sourceid`),
+  KEY `weatherdatalayout_FKIndex1` (`weatherscreens_screen_id`),
+  KEY `weatherdatalayout_FKIndex2` (`weathersourcesettings_sourceid`),
+  CONSTRAINT `weatherdatalayout_ibfk_1` FOREIGN KEY (`weatherscreens_screen_id`) REFERENCES `weatherscreens` (`screen_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `weatherdatalayout_ibfk_2` FOREIGN KEY (`weathersourcesettings_sourceid`) REFERENCES `weathersourcesettings` (`sourceid`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `weatherdatalayout`
+--
+
+LOCK TABLES `weatherdatalayout` WRITE;
+/*!40000 ALTER TABLE `weatherdatalayout` DISABLE KEYS */;
+/*!40000 ALTER TABLE `weatherdatalayout` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `weatherscreens`
+--
+
+DROP TABLE IF EXISTS `weatherscreens`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `weatherscreens` (
+  `screen_id` int(10) unsigned NOT NULL auto_increment,
+  `draworder` int(10) unsigned NOT NULL,
+  `container` varchar(64) NOT NULL,
+  `hostname` varchar(64) default NULL,
+  `units` tinyint(3) unsigned NOT NULL,
+  PRIMARY KEY  (`screen_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `weatherscreens`
+--
+
+LOCK TABLES `weatherscreens` WRITE;
+/*!40000 ALTER TABLE `weatherscreens` DISABLE KEYS */;
+/*!40000 ALTER TABLE `weatherscreens` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `weathersourcesettings`
+--
+
+DROP TABLE IF EXISTS `weathersourcesettings`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `weathersourcesettings` (
+  `sourceid` int(10) unsigned NOT NULL auto_increment,
+  `source_name` varchar(64) NOT NULL,
+  `update_timeout` int(10) unsigned NOT NULL default '600',
+  `retrieve_timeout` int(10) unsigned NOT NULL default '60',
+  `hostname` varchar(64) default NULL,
+  `path` varchar(255) default NULL,
+  `author` varchar(128) default NULL,
+  `version` varchar(32) default NULL,
+  `email` varchar(255) default NULL,
+  `types` mediumtext,
+  `updated` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  PRIMARY KEY  (`sourceid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `weathersourcesettings`
+--
+
+LOCK TABLES `weathersourcesettings` WRITE;
+/*!40000 ALTER TABLE `weathersourcesettings` DISABLE KEYS */;
+/*!40000 ALTER TABLE `weathersourcesettings` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `websites`
+--
+
+DROP TABLE IF EXISTS `websites`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `websites` (
+  `id` int(10) unsigned NOT NULL auto_increment,
+  `category` varchar(100) NOT NULL,
+  `name` varchar(100) NOT NULL,
+  `url` varchar(255) NOT NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `websites`
+--
+
+LOCK TABLES `websites` WRITE;
+/*!40000 ALTER TABLE `websites` DISABLE KEYS */;
+/*!40000 ALTER TABLE `websites` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2010-01-18  5:37:32
diff --git a/abs/core-testing/mythdb-initial/mc.sql.21 b/abs/core-testing/mythdb-initial/mc.sql.21
new file mode 100644
index 0000000..cdb22d4
--- /dev/null
+++ b/abs/core-testing/mythdb-initial/mc.sql.21
@@ -0,0 +1,2835 @@
+-- MySQL dump 10.11
+--
+-- Host: localhost    Database: mythconverg
+-- ------------------------------------------------------
+-- Server version	5.0.60
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `archiveitems`
+--
+
+DROP TABLE IF EXISTS `archiveitems`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `archiveitems` (
+  `intid` int(10) unsigned NOT NULL auto_increment,
+  `type` set('Recording','Video','File') default NULL,
+  `title` varchar(128) default NULL,
+  `subtitle` varchar(128) default NULL,
+  `description` text,
+  `startdate` varchar(30) default NULL,
+  `starttime` varchar(30) default NULL,
+  `size` bigint(20) unsigned NOT NULL,
+  `filename` text NOT NULL,
+  `hascutlist` tinyint(1) NOT NULL default '0',
+  `cutlist` text,
+  PRIMARY KEY  (`intid`),
+  KEY `title` (`title`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `archiveitems`
+--
+
+LOCK TABLES `archiveitems` WRITE;
+/*!40000 ALTER TABLE `archiveitems` DISABLE KEYS */;
+/*!40000 ALTER TABLE `archiveitems` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `callsignnetworkmap`
+--
+
+DROP TABLE IF EXISTS `callsignnetworkmap`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `callsignnetworkmap` (
+  `id` int(11) NOT NULL auto_increment,
+  `callsign` varchar(20) NOT NULL default '',
+  `network` varchar(20) NOT NULL default '',
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `callsign` (`callsign`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `callsignnetworkmap`
+--
+
+LOCK TABLES `callsignnetworkmap` WRITE;
+/*!40000 ALTER TABLE `callsignnetworkmap` DISABLE KEYS */;
+/*!40000 ALTER TABLE `callsignnetworkmap` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `capturecard`
+--
+
+DROP TABLE IF EXISTS `capturecard`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `capturecard` (
+  `cardid` int(10) unsigned NOT NULL auto_increment,
+  `videodevice` varchar(128) default NULL,
+  `audiodevice` varchar(128) default NULL,
+  `vbidevice` varchar(128) default NULL,
+  `cardtype` varchar(32) default 'V4L',
+  `defaultinput` varchar(32) default 'Television',
+  `audioratelimit` int(11) default NULL,
+  `hostname` varchar(255) default NULL,
+  `dvb_swfilter` int(11) default '0',
+  `dvb_sat_type` int(11) NOT NULL default '0',
+  `dvb_wait_for_seqstart` int(11) NOT NULL default '1',
+  `skipbtaudio` tinyint(1) default '0',
+  `dvb_on_demand` tinyint(4) NOT NULL default '0',
+  `dvb_diseqc_type` smallint(6) default NULL,
+  `firewire_port` int(10) unsigned NOT NULL default '0',
+  `firewire_node` int(10) unsigned NOT NULL default '2',
+  `firewire_speed` int(10) unsigned NOT NULL default '0',
+  `firewire_model` varchar(32) default NULL,
+  `firewire_connection` int(10) unsigned NOT NULL default '0',
+  `dbox2_port` int(10) unsigned NOT NULL default '31338',
+  `dbox2_httpport` int(10) unsigned NOT NULL default '80',
+  `dbox2_host` varchar(32) default NULL,
+  `signal_timeout` int(11) NOT NULL default '1000',
+  `channel_timeout` int(11) NOT NULL default '3000',
+  `dvb_tuning_delay` int(10) unsigned NOT NULL default '0',
+  `contrast` int(11) NOT NULL default '0',
+  `brightness` int(11) NOT NULL default '0',
+  `colour` int(11) NOT NULL default '0',
+  `hue` int(11) NOT NULL default '0',
+  `diseqcid` int(10) unsigned default NULL,
+  `dvb_eitscan` tinyint(1) NOT NULL default '1',
+  PRIMARY KEY  (`cardid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `capturecard`
+--
+
+LOCK TABLES `capturecard` WRITE;
+/*!40000 ALTER TABLE `capturecard` DISABLE KEYS */;
+/*!40000 ALTER TABLE `capturecard` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `cardinput`
+--
+
+DROP TABLE IF EXISTS `cardinput`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `cardinput` (
+  `cardinputid` int(10) unsigned NOT NULL auto_increment,
+  `cardid` int(10) unsigned NOT NULL default '0',
+  `sourceid` int(10) unsigned NOT NULL default '0',
+  `inputname` varchar(32) NOT NULL default '',
+  `externalcommand` varchar(128) default NULL,
+  `preference` int(11) NOT NULL default '0',
+  `shareable` char(1) default 'N',
+  `tunechan` varchar(10) default NULL,
+  `startchan` varchar(10) default NULL,
+  `freetoaironly` tinyint(1) default '1',
+  `diseqc_port` smallint(6) default NULL,
+  `diseqc_pos` float default NULL,
+  `lnb_lof_switch` int(11) default '11700000',
+  `lnb_lof_hi` int(11) default '10600000',
+  `lnb_lof_lo` int(11) default '9750000',
+  `displayname` varchar(64) NOT NULL default '',
+  `radioservices` tinyint(1) default '1',
+  `dishnet_eit` tinyint(1) NOT NULL default '0',
+  `recpriority` int(11) NOT NULL default '0',
+  `quicktune` tinyint(4) NOT NULL default '0',
+  PRIMARY KEY  (`cardinputid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `cardinput`
+--
+
+LOCK TABLES `cardinput` WRITE;
+/*!40000 ALTER TABLE `cardinput` DISABLE KEYS */;
+/*!40000 ALTER TABLE `cardinput` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `channel`
+--
+
+DROP TABLE IF EXISTS `channel`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `channel` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `channum` varchar(10) NOT NULL default '',
+  `freqid` varchar(10) default NULL,
+  `sourceid` int(10) unsigned default NULL,
+  `callsign` varchar(20) NOT NULL default '',
+  `name` varchar(64) NOT NULL default '',
+  `icon` varchar(255) NOT NULL default 'none',
+  `finetune` int(11) default NULL,
+  `videofilters` varchar(255) NOT NULL default '',
+  `xmltvid` varchar(64) NOT NULL default '',
+  `recpriority` int(10) NOT NULL default '0',
+  `contrast` int(11) default '32768',
+  `brightness` int(11) default '32768',
+  `colour` int(11) default '32768',
+  `hue` int(11) default '32768',
+  `tvformat` varchar(10) NOT NULL default 'Default',
+  `commfree` tinyint(4) NOT NULL default '0',
+  `visible` tinyint(1) NOT NULL default '1',
+  `outputfilters` varchar(255) NOT NULL default '',
+  `useonairguide` tinyint(1) default '0',
+  `mplexid` smallint(6) default NULL,
+  `serviceid` mediumint(8) unsigned default NULL,
+  `atscsrcid` int(11) default NULL,
+  `tmoffset` int(11) NOT NULL default '0',
+  `atsc_major_chan` int(10) unsigned NOT NULL default '0',
+  `atsc_minor_chan` int(10) unsigned NOT NULL default '0',
+  `last_record` datetime NOT NULL,
+  `default_authority` varchar(32) NOT NULL default '',
+  `commmethod` int(11) NOT NULL default '-1',
+  PRIMARY KEY  (`chanid`),
+  KEY `channel_src` (`channum`,`sourceid`),
+  KEY `sourceid` (`sourceid`,`xmltvid`,`chanid`),
+  KEY `visible` (`visible`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `channel`
+--
+
+LOCK TABLES `channel` WRITE;
+/*!40000 ALTER TABLE `channel` DISABLE KEYS */;
+/*!40000 ALTER TABLE `channel` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `codecparams`
+--
+
+DROP TABLE IF EXISTS `codecparams`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `codecparams` (
+  `profile` int(10) unsigned NOT NULL default '0',
+  `name` varchar(128) NOT NULL default '',
+  `value` varchar(128) default NULL,
+  PRIMARY KEY  (`profile`,`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `codecparams`
+--
+
+LOCK TABLES `codecparams` WRITE;
+/*!40000 ALTER TABLE `codecparams` DISABLE KEYS */;
+/*!40000 ALTER TABLE `codecparams` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `credits`
+--
+
+DROP TABLE IF EXISTS `credits`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `credits` (
+  `person` mediumint(8) unsigned NOT NULL default '0',
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `role` set('actor','director','producer','executive_producer','writer','guest_star','host','adapter','presenter','commentator','guest') NOT NULL default '',
+  UNIQUE KEY `chanid` (`chanid`,`starttime`,`person`,`role`),
+  KEY `person` (`person`,`role`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `credits`
+--
+
+LOCK TABLES `credits` WRITE;
+/*!40000 ALTER TABLE `credits` DISABLE KEYS */;
+/*!40000 ALTER TABLE `credits` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `customexample`
+--
+
+DROP TABLE IF EXISTS `customexample`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `customexample` (
+  `rulename` varchar(64) NOT NULL,
+  `fromclause` text NOT NULL,
+  `whereclause` text NOT NULL,
+  `search` tinyint(4) NOT NULL default '0',
+  PRIMARY KEY  (`rulename`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `customexample`
+--
+
+LOCK TABLES `customexample` WRITE;
+/*!40000 ALTER TABLE `customexample` DISABLE KEYS */;
+INSERT INTO `customexample` (`rulename`, `fromclause`, `whereclause`, `search`) VALUES ('New Flix','','program.category_type = \'movie\' AND program.airdate >= \n     YEAR(DATE_SUB(NOW(), INTERVAL 1 YEAR)) \nAND program.stars > 0.5 ',1);
+/*!40000 ALTER TABLE `customexample` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `diseqc_config`
+--
+
+DROP TABLE IF EXISTS `diseqc_config`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `diseqc_config` (
+  `cardinputid` int(10) unsigned NOT NULL,
+  `diseqcid` int(10) unsigned NOT NULL,
+  `value` varchar(16) NOT NULL default '',
+  KEY `id` (`cardinputid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `diseqc_config`
+--
+
+LOCK TABLES `diseqc_config` WRITE;
+/*!40000 ALTER TABLE `diseqc_config` DISABLE KEYS */;
+/*!40000 ALTER TABLE `diseqc_config` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `diseqc_tree`
+--
+
+DROP TABLE IF EXISTS `diseqc_tree`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `diseqc_tree` (
+  `diseqcid` int(10) unsigned NOT NULL auto_increment,
+  `parentid` int(10) unsigned default NULL,
+  `ordinal` tinyint(3) unsigned NOT NULL,
+  `type` varchar(16) NOT NULL default '',
+  `subtype` varchar(16) NOT NULL default '',
+  `description` varchar(32) NOT NULL default '',
+  `switch_ports` tinyint(3) unsigned NOT NULL default '0',
+  `rotor_hi_speed` float NOT NULL default '0',
+  `rotor_lo_speed` float NOT NULL default '0',
+  `rotor_positions` varchar(255) NOT NULL default '',
+  `lnb_lof_switch` int(10) NOT NULL default '0',
+  `lnb_lof_hi` int(10) NOT NULL default '0',
+  `lnb_lof_lo` int(10) NOT NULL default '0',
+  `cmd_repeat` int(11) NOT NULL default '1',
+  `lnb_pol_inv` tinyint(4) NOT NULL default '0',
+  PRIMARY KEY  (`diseqcid`),
+  KEY `parentid` (`parentid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `diseqc_tree`
+--
+
+LOCK TABLES `diseqc_tree` WRITE;
+/*!40000 ALTER TABLE `diseqc_tree` DISABLE KEYS */;
+/*!40000 ALTER TABLE `diseqc_tree` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `displayprofilegroups`
+--
+
+DROP TABLE IF EXISTS `displayprofilegroups`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `displayprofilegroups` (
+  `name` varchar(128) NOT NULL,
+  `hostname` varchar(255) NOT NULL,
+  `profilegroupid` int(10) unsigned NOT NULL auto_increment,
+  PRIMARY KEY  (`name`,`hostname`),
+  UNIQUE KEY `profilegroupid` (`profilegroupid`)
+) ENGINE=MyISAM AUTO_INCREMENT=7 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `displayprofilegroups`
+--
+
+LOCK TABLES `displayprofilegroups` WRITE;
+/*!40000 ALTER TABLE `displayprofilegroups` DISABLE KEYS */;
+INSERT INTO `displayprofilegroups` (`name`, `hostname`, `profilegroupid`) VALUES ('CPU++','larch5',1),('CPU+','larch5',2),('CPU--','larch5',3),('High Quality','larch5',4),('Normal','larch5',5),('Slim','larch5',6);
+/*!40000 ALTER TABLE `displayprofilegroups` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `displayprofiles`
+--
+
+DROP TABLE IF EXISTS `displayprofiles`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `displayprofiles` (
+  `profilegroupid` int(10) unsigned NOT NULL,
+  `profileid` int(10) unsigned NOT NULL auto_increment,
+  `value` varchar(128) NOT NULL,
+  `data` varchar(255) NOT NULL default '',
+  KEY `profilegroupid` (`profilegroupid`),
+  KEY `profileid` (`profileid`,`value`),
+  KEY `profileid_2` (`profileid`)
+) ENGINE=MyISAM AUTO_INCREMENT=25 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `displayprofiles`
+--
+
+LOCK TABLES `displayprofiles` WRITE;
+/*!40000 ALTER TABLE `displayprofiles` DISABLE KEYS */;
+INSERT INTO `displayprofiles` (`profilegroupid`, `profileid`, `value`, `data`) VALUES (1,1,'pref_priority','1'),(1,1,'pref_cmp0','> 0 0'),(1,1,'pref_decoder','ffmpeg'),(1,1,'pref_max_cpus','1'),(1,1,'pref_videorenderer','xv-blit'),(1,1,'pref_osdrenderer','softblend'),(1,1,'pref_osdfade','1'),(1,1,'pref_deint0','bobdeint'),(1,1,'pref_deint1','linearblend'),(1,1,'pref_filters',''),(1,2,'pref_priority','2'),(1,2,'pref_cmp0','> 0 0'),(1,2,'pref_decoder','ffmpeg'),(1,2,'pref_max_cpus','1'),(1,2,'pref_videorenderer','quartz-blit'),(1,2,'pref_osdrenderer','softblend'),(1,2,'pref_osdfade','1'),(1,2,'pref_deint0','linearblend'),(1,2,'pref_deint1','linearblend'),(1,2,'pref_filters',''),(2,3,'pref_priority','1'),(2,3,'pref_cmp0','<= 720 576'),(2,3,'pref_cmp1','> 0 0'),(2,3,'pref_decoder','ffmpeg'),(2,3,'pref_max_cpus','1'),(2,3,'pref_videorenderer','xv-blit'),(2,3,'pref_osdrenderer','softblend'),(2,3,'pref_osdfade','1'),(2,3,'pref_deint0','bobdeint'),(2,3,'pref_deint1','linearblend'),(2,3,'pref_filters',''),(2,4,'pref_priority','2'),(2,4,'pref_cmp0','<= 1280 720'),(2,4,'pref_cmp1','> 720 576'),(2,4,'pref_decoder','xvmc'),(2,4,'pref_max_cpus','1'),(2,4,'pref_videorenderer','xvmc-blit'),(2,4,'pref_osdrenderer','opengl'),(2,4,'pref_osdfade','1'),(2,4,'pref_deint0','bobdeint'),(2,4,'pref_deint1','onefield'),(2,4,'pref_filters',''),(2,5,'pref_priority','3'),(2,5,'pref_cmp0','<= 1280 720'),(2,5,'pref_cmp1','> 720 576'),(2,5,'pref_decoder','libmpeg2'),(2,5,'pref_max_cpus','1'),(2,5,'pref_videorenderer','xv-blit'),(2,5,'pref_osdrenderer','softblend'),(2,5,'pref_osdfade','1'),(2,5,'pref_deint0','bobdeint'),(2,5,'pref_deint1','onefield'),(2,5,'pref_filters',''),(2,6,'pref_priority','4'),(2,6,'pref_cmp0','> 0 0'),(2,6,'pref_decoder','xvmc'),(2,6,'pref_max_cpus','1'),(2,6,'pref_videorenderer','xvmc-blit'),(2,6,'pref_osdrenderer','ia44blend'),(2,6,'pref_osdfade','0'),(2,6,'pref_deint0','bobdeint'),(2,6,'pref_deint1','onefield'),(2,6,'pref_filters',''),(2,7,'pref_priority','5'),(2,7,'pref_cmp0','> 0 0'),(2,7,'pref_decoder','libmpeg2'),(2,7,'pref_max_cpus','1'),(2,7,'pref_videorenderer','xv-blit'),(2,7,'pref_osdrenderer','chromakey'),(2,7,'pref_osdfade','0'),(2,7,'pref_deint0','bobdeint'),(2,7,'pref_deint1','onefield'),(2,7,'pref_filters',''),(3,8,'pref_priority','1'),(3,8,'pref_cmp0','<= 720 576'),(3,8,'pref_cmp1','> 0 0'),(3,8,'pref_decoder','ivtv'),(3,8,'pref_max_cpus','1'),(3,8,'pref_videorenderer','ivtv'),(3,8,'pref_osdrenderer','ivtv'),(3,8,'pref_osdfade','1'),(3,8,'pref_deint0','none'),(3,8,'pref_deint1','none'),(3,8,'pref_filters',''),(3,9,'pref_priority','2'),(3,9,'pref_cmp0','<= 720 576'),(3,9,'pref_cmp1','> 0 0'),(3,9,'pref_decoder','xvmc'),(3,9,'pref_max_cpus','1'),(3,9,'pref_videorenderer','xvmc-blit'),(3,9,'pref_osdrenderer','ia44blend'),(3,9,'pref_osdfade','0'),(3,9,'pref_deint0','bobdeint'),(3,9,'pref_deint1','onefield'),(3,9,'pref_filters',''),(3,10,'pref_priority','3'),(3,10,'pref_cmp0','<= 1280 720'),(3,10,'pref_cmp1','> 720 576'),(3,10,'pref_decoder','xvmc'),(3,10,'pref_max_cpus','1'),(3,10,'pref_videorenderer','xvmc-blit'),(3,10,'pref_osdrenderer','ia44blend'),(3,10,'pref_osdfade','0'),(3,10,'pref_deint0','bobdeint'),(3,10,'pref_deint1','onefield'),(3,10,'pref_filters',''),(3,11,'pref_priority','4'),(3,11,'pref_cmp0','> 0 0'),(3,11,'pref_decoder','xvmc'),(3,11,'pref_max_cpus','1'),(3,11,'pref_videorenderer','xvmc-blit'),(3,11,'pref_osdrenderer','ia44blend'),(3,11,'pref_osdfade','0'),(3,11,'pref_deint0','bobdeint'),(3,11,'pref_deint1','onefield'),(3,11,'pref_filters',''),(3,12,'pref_priority','5'),(3,12,'pref_cmp0','> 0 0'),(3,12,'pref_decoder','libmpeg2'),(3,12,'pref_max_cpus','1'),(3,12,'pref_videorenderer','xv-blit'),(3,12,'pref_osdrenderer','chromakey'),(3,12,'pref_osdfade','0'),(3,12,'pref_deint0','none'),(3,12,'pref_deint1','none'),(3,12,'pref_filters',''),(4,13,'pref_priority','1'),(4,13,'pref_cmp0','>= 1920 1080'),(4,13,'pref_decoder','ffmpeg'),(4,13,'pref_max_cpus','2'),(4,13,'pref_videorenderer','xv-blit'),(4,13,'pref_osdrenderer','softblend'),(4,13,'pref_osdfade','1'),(4,13,'pref_deint0','linearblend'),(4,13,'pref_deint1','linearblend'),(4,13,'pref_filters',''),(4,14,'pref_priority','2'),(4,14,'pref_cmp0','> 0 0'),(4,14,'pref_decoder','ffmpeg'),(4,14,'pref_max_cpus','1'),(4,14,'pref_videorenderer','xv-blit'),(4,14,'pref_osdrenderer','softblend'),(4,14,'pref_osdfade','1'),(4,14,'pref_deint0','yadifdoubleprocessdeint'),(4,14,'pref_deint1','yadifdeint'),(4,14,'pref_filters',''),(4,15,'pref_priority','3'),(4,15,'pref_cmp0','>= 1920 1080'),(4,15,'pref_decoder','ffmpeg'),(4,15,'pref_max_cpus','2'),(4,15,'pref_videorenderer','quartz-blit'),(4,15,'pref_osdrenderer','softblend'),(4,15,'pref_osdfade','1'),(4,15,'pref_deint0','linearblend'),(4,15,'pref_deint1','linearblend'),(4,15,'pref_filters',''),(4,16,'pref_priority','4'),(4,16,'pref_cmp0','> 0 0'),(4,16,'pref_decoder','ffmpeg'),(4,16,'pref_max_cpus','1'),(4,16,'pref_videorenderer','quartz-blit'),(4,16,'pref_osdrenderer','softblend'),(4,16,'pref_osdfade','1'),(4,16,'pref_deint0','yadifdoubleprocessdeint'),(4,16,'pref_deint1','yadifdeint'),(4,16,'pref_filters',''),(5,17,'pref_priority','1'),(5,17,'pref_cmp0','>= 1280 720'),(5,17,'pref_decoder','ffmpeg'),(5,17,'pref_max_cpus','1'),(5,17,'pref_videorenderer','xv-blit'),(5,17,'pref_osdrenderer','softblend'),(5,17,'pref_osdfade','0'),(5,17,'pref_deint0','linearblend'),(5,17,'pref_deint1','linearblend'),(5,17,'pref_filters',''),(5,18,'pref_priority','2'),(5,18,'pref_cmp0','> 0 0'),(5,18,'pref_decoder','ffmpeg'),(5,18,'pref_max_cpus','1'),(5,18,'pref_videorenderer','xv-blit'),(5,18,'pref_osdrenderer','softblend'),(5,18,'pref_osdfade','1'),(5,18,'pref_deint0','greedyhdoubleprocessdeint'),(5,18,'pref_deint1','kerneldeint'),(5,18,'pref_filters',''),(5,19,'pref_priority','3'),(5,19,'pref_cmp0','>= 1280 720'),(5,19,'pref_decoder','ffmpeg'),(5,19,'pref_max_cpus','1'),(5,19,'pref_videorenderer','quartz-blit'),(5,19,'pref_osdrenderer','softblend'),(5,19,'pref_osdfade','0'),(5,19,'pref_deint0','linearblend'),(5,19,'pref_deint1','linearblend'),(5,19,'pref_filters',''),(5,20,'pref_priority','4'),(5,20,'pref_cmp0','> 0 0'),(5,20,'pref_decoder','ffmpeg'),(5,20,'pref_max_cpus','1'),(5,20,'pref_videorenderer','quartz-blit'),(5,20,'pref_osdrenderer','softblend'),(5,20,'pref_osdfade','1'),(5,20,'pref_deint0','greedyhdoubleprocessdeint'),(5,20,'pref_deint1','kerneldeint'),(5,20,'pref_filters',''),(6,21,'pref_priority','1'),(6,21,'pref_cmp0','>= 1280 720'),(6,21,'pref_decoder','ffmpeg'),(6,21,'pref_max_cpus','1'),(6,21,'pref_videorenderer','xv-blit'),(6,21,'pref_osdrenderer','softblend'),(6,21,'pref_osdfade','0'),(6,21,'pref_deint0','onefield'),(6,21,'pref_deint1','onefield'),(6,21,'pref_filters',''),(6,22,'pref_priority','2'),(6,22,'pref_cmp0','> 0 0'),(6,22,'pref_decoder','ffmpeg'),(6,22,'pref_max_cpus','1'),(6,22,'pref_videorenderer','xv-blit'),(6,22,'pref_osdrenderer','softblend'),(6,22,'pref_osdfade','1'),(6,22,'pref_deint0','linearblend'),(6,22,'pref_deint1','linearblend'),(6,22,'pref_filters',''),(6,23,'pref_priority','3'),(6,23,'pref_cmp0','>= 1280 720'),(6,23,'pref_decoder','ffmpeg'),(6,23,'pref_max_cpus','1'),(6,23,'pref_videorenderer','quartz-blit'),(6,23,'pref_osdrenderer','softblend'),(6,23,'pref_osdfade','0'),(6,23,'pref_deint0','onefield'),(6,23,'pref_deint1','onefield'),(6,23,'pref_filters',''),(6,24,'pref_priority','4'),(6,24,'pref_cmp0','> 0 0'),(6,24,'pref_decoder','ffmpeg'),(6,24,'pref_max_cpus','1'),(6,24,'pref_videorenderer','quartz-blit'),(6,24,'pref_osdrenderer','softblend'),(6,24,'pref_osdfade','1'),(6,24,'pref_deint0','linearblend'),(6,24,'pref_deint1','linearblend'),(6,24,'pref_filters','');
+/*!40000 ALTER TABLE `displayprofiles` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `dtv_multiplex`
+--
+
+DROP TABLE IF EXISTS `dtv_multiplex`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `dtv_multiplex` (
+  `mplexid` smallint(6) NOT NULL auto_increment,
+  `sourceid` smallint(6) default NULL,
+  `transportid` int(11) default NULL,
+  `networkid` int(11) default NULL,
+  `frequency` int(11) default NULL,
+  `inversion` char(1) default 'a',
+  `symbolrate` int(11) default NULL,
+  `fec` varchar(10) default 'auto',
+  `polarity` char(1) default NULL,
+  `modulation` varchar(10) default 'auto',
+  `bandwidth` char(1) default 'a',
+  `lp_code_rate` varchar(10) default 'auto',
+  `transmission_mode` char(1) default 'a',
+  `guard_interval` varchar(10) default 'auto',
+  `visible` smallint(1) NOT NULL default '0',
+  `constellation` varchar(10) default 'auto',
+  `hierarchy` varchar(10) default 'auto',
+  `hp_code_rate` varchar(10) default 'auto',
+  `sistandard` varchar(10) default 'dvb',
+  `serviceversion` smallint(6) default '33',
+  `updatetimestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  PRIMARY KEY  (`mplexid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `dtv_multiplex`
+--
+
+LOCK TABLES `dtv_multiplex` WRITE;
+/*!40000 ALTER TABLE `dtv_multiplex` DISABLE KEYS */;
+/*!40000 ALTER TABLE `dtv_multiplex` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `dtv_privatetypes`
+--
+
+DROP TABLE IF EXISTS `dtv_privatetypes`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `dtv_privatetypes` (
+  `sitype` varchar(4) NOT NULL default '',
+  `networkid` int(11) NOT NULL default '0',
+  `private_type` varchar(20) NOT NULL default '',
+  `private_value` varchar(100) NOT NULL default ''
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `dtv_privatetypes`
+--
+
+LOCK TABLES `dtv_privatetypes` WRITE;
+/*!40000 ALTER TABLE `dtv_privatetypes` DISABLE KEYS */;
+INSERT INTO `dtv_privatetypes` (`sitype`, `networkid`, `private_type`, `private_value`) VALUES ('dvb',9018,'channel_numbers','131'),('dvb',9018,'guide_fixup','2'),('dvb',256,'guide_fixup','1'),('dvb',257,'guide_fixup','1'),('dvb',256,'tv_types','1,150,134,133'),('dvb',257,'tv_types','1,150,134,133'),('dvb',4100,'sdt_mapping','1'),('dvb',4101,'sdt_mapping','1'),('dvb',4102,'sdt_mapping','1'),('dvb',4103,'sdt_mapping','1'),('dvb',4104,'sdt_mapping','1'),('dvb',4105,'sdt_mapping','1'),('dvb',4106,'sdt_mapping','1'),('dvb',4107,'sdt_mapping','1'),('dvb',4097,'sdt_mapping','1'),('dvb',4098,'sdt_mapping','1'),('dvb',4100,'tv_types','1,145,154'),('dvb',4101,'tv_types','1,145,154'),('dvb',4102,'tv_types','1,145,154'),('dvb',4103,'tv_types','1,145,154'),('dvb',4104,'tv_types','1,145,154'),('dvb',4105,'tv_types','1,145,154'),('dvb',4106,'tv_types','1,145,154'),('dvb',4107,'tv_types','1,145,154'),('dvb',4097,'tv_types','1,145,154'),('dvb',4098,'tv_types','1,145,154'),('dvb',4100,'guide_fixup','1'),('dvb',4101,'guide_fixup','1'),('dvb',4102,'guide_fixup','1'),('dvb',4103,'guide_fixup','1'),('dvb',4104,'guide_fixup','1'),('dvb',4105,'guide_fixup','1'),('dvb',4106,'guide_fixup','1'),('dvb',4107,'guide_fixup','1'),('dvb',4096,'guide_fixup','5'),('dvb',4097,'guide_fixup','1'),('dvb',4098,'guide_fixup','1'),('dvb',94,'tv_types','1,128'),('atsc',1793,'guide_fixup','3'),('dvb',40999,'guide_fixup','4'),('dvb',70,'force_guide_present','yes'),('dvb',70,'guide_ranges','80,80,96,96'),('dvb',4112,'channel_numbers','131'),('dvb',4115,'channel_numbers','131'),('dvb',4116,'channel_numbers','131'),('dvb',12802,'channel_numbers','131'),('dvb',12803,'channel_numbers','131'),('dvb',12829,'channel_numbers','131'),('dvb',40999,'parse_subtitle_list','1070,1308,1041,1306,1307,1030,1016,1131,1068,1069'),('dvb',4096,'guide_fixup','5');
+/*!40000 ALTER TABLE `dtv_privatetypes` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `dvdbookmark`
+--
+
+DROP TABLE IF EXISTS `dvdbookmark`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `dvdbookmark` (
+  `serialid` varchar(16) NOT NULL default '',
+  `name` varchar(32) default NULL,
+  `title` smallint(6) NOT NULL default '0',
+  `audionum` tinyint(4) NOT NULL default '-1',
+  `subtitlenum` tinyint(4) NOT NULL default '-1',
+  `framenum` bigint(20) NOT NULL default '0',
+  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  PRIMARY KEY  (`serialid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `dvdbookmark`
+--
+
+LOCK TABLES `dvdbookmark` WRITE;
+/*!40000 ALTER TABLE `dvdbookmark` DISABLE KEYS */;
+/*!40000 ALTER TABLE `dvdbookmark` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `dvdinput`
+--
+
+DROP TABLE IF EXISTS `dvdinput`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `dvdinput` (
+  `intid` int(10) unsigned NOT NULL,
+  `hsize` int(10) unsigned default NULL,
+  `vsize` int(10) unsigned default NULL,
+  `ar_num` int(10) unsigned default NULL,
+  `ar_denom` int(10) unsigned default NULL,
+  `fr_code` int(10) unsigned default NULL,
+  `letterbox` tinyint(1) default NULL,
+  `v_format` varchar(16) default NULL,
+  PRIMARY KEY  (`intid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `dvdinput`
+--
+
+LOCK TABLES `dvdinput` WRITE;
+/*!40000 ALTER TABLE `dvdinput` DISABLE KEYS */;
+INSERT INTO `dvdinput` (`intid`, `hsize`, `vsize`, `ar_num`, `ar_denom`, `fr_code`, `letterbox`, `v_format`) VALUES (1,720,480,16,9,1,1,'ntsc'),(2,720,480,16,9,1,0,'ntsc'),(3,720,480,4,3,1,1,'ntsc'),(4,720,480,4,3,1,0,'ntsc'),(5,720,576,16,9,3,1,'pal'),(6,720,576,16,9,3,0,'pal'),(7,720,576,4,3,3,1,'pal'),(8,720,576,4,3,3,0,'pal');
+/*!40000 ALTER TABLE `dvdinput` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `dvdtranscode`
+--
+
+DROP TABLE IF EXISTS `dvdtranscode`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `dvdtranscode` (
+  `intid` int(11) NOT NULL auto_increment,
+  `input` int(10) unsigned default NULL,
+  `name` varchar(128) NOT NULL,
+  `sync_mode` int(10) unsigned default NULL,
+  `use_yv12` tinyint(1) default NULL,
+  `cliptop` int(11) default NULL,
+  `clipbottom` int(11) default NULL,
+  `clipleft` int(11) default NULL,
+  `clipright` int(11) default NULL,
+  `f_resize_h` int(11) default NULL,
+  `f_resize_w` int(11) default NULL,
+  `hq_resize_h` int(11) default NULL,
+  `hq_resize_w` int(11) default NULL,
+  `grow_h` int(11) default NULL,
+  `grow_w` int(11) default NULL,
+  `clip2top` int(11) default NULL,
+  `clip2bottom` int(11) default NULL,
+  `clip2left` int(11) default NULL,
+  `clip2right` int(11) default NULL,
+  `codec` varchar(128) NOT NULL,
+  `codec_param` varchar(128) default NULL,
+  `bitrate` int(11) default NULL,
+  `a_sample_r` int(11) default NULL,
+  `a_bitrate` int(11) default NULL,
+  `two_pass` tinyint(1) default NULL,
+  `tc_param` varchar(128) default NULL,
+  PRIMARY KEY  (`intid`)
+) ENGINE=MyISAM AUTO_INCREMENT=12 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `dvdtranscode`
+--
+
+LOCK TABLES `dvdtranscode` WRITE;
+/*!40000 ALTER TABLE `dvdtranscode` DISABLE KEYS */;
+INSERT INTO `dvdtranscode` (`intid`, `input`, `name`, `sync_mode`, `use_yv12`, `cliptop`, `clipbottom`, `clipleft`, `clipright`, `f_resize_h`, `f_resize_w`, `hq_resize_h`, `hq_resize_w`, `grow_h`, `grow_w`, `clip2top`, `clip2bottom`, `clip2left`, `clip2right`, `codec`, `codec_param`, `bitrate`, `a_sample_r`, `a_bitrate`, `two_pass`, `tc_param`) VALUES (1,1,'Good',2,1,16,16,0,0,2,0,0,0,0,0,32,32,8,8,'divx5',NULL,1618,NULL,NULL,0,NULL),(2,2,'Excellent',2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'divx5',NULL,0,NULL,NULL,1,NULL),(3,2,'Good',2,1,0,0,8,8,0,0,0,0,0,0,0,0,0,0,'divx5',NULL,1618,NULL,NULL,0,NULL),(4,2,'Medium',2,1,0,0,8,8,5,5,0,0,0,0,0,0,0,0,'divx5',NULL,1200,NULL,NULL,0,NULL),(5,3,'Good',2,1,0,0,0,0,0,0,0,0,2,0,80,80,8,8,'divx5',NULL,0,NULL,NULL,0,NULL),(6,4,'Excellent',2,1,0,0,0,0,0,0,0,0,2,0,0,0,0,0,'divx5',NULL,0,NULL,NULL,1,NULL),(7,4,'Good',2,1,0,0,8,8,0,2,0,0,0,0,0,0,0,0,'divx5',NULL,1618,NULL,NULL,0,NULL),(8,5,'Good',1,1,16,16,0,0,5,0,0,0,0,0,40,40,8,8,'divx5',NULL,1618,NULL,NULL,0,NULL),(9,6,'Good',1,1,0,0,16,16,5,0,0,0,0,0,0,0,0,0,'divx5',NULL,1618,NULL,NULL,0,NULL),(10,7,'Good',1,1,0,0,0,0,1,0,0,0,0,0,76,76,8,8,'divx5',NULL,1618,NULL,NULL,0,NULL),(11,8,'Good',1,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,'divx5',NULL,1618,NULL,NULL,0,NULL);
+/*!40000 ALTER TABLE `dvdtranscode` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `eit_cache`
+--
+
+DROP TABLE IF EXISTS `eit_cache`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `eit_cache` (
+  `chanid` int(10) NOT NULL,
+  `eventid` int(10) unsigned NOT NULL default '0',
+  `tableid` tinyint(3) unsigned NOT NULL,
+  `version` tinyint(3) unsigned NOT NULL,
+  `endtime` int(10) unsigned NOT NULL,
+  `status` tinyint(4) NOT NULL default '0',
+  PRIMARY KEY  (`chanid`,`eventid`,`status`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `eit_cache`
+--
+
+LOCK TABLES `eit_cache` WRITE;
+/*!40000 ALTER TABLE `eit_cache` DISABLE KEYS */;
+/*!40000 ALTER TABLE `eit_cache` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `favorites`
+--
+
+DROP TABLE IF EXISTS `favorites`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `favorites` (
+  `favid` int(11) unsigned NOT NULL auto_increment,
+  `userid` int(11) unsigned NOT NULL default '0',
+  `chanid` int(11) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`favid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `favorites`
+--
+
+LOCK TABLES `favorites` WRITE;
+/*!40000 ALTER TABLE `favorites` DISABLE KEYS */;
+/*!40000 ALTER TABLE `favorites` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `filemarkup`
+--
+
+DROP TABLE IF EXISTS `filemarkup`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `filemarkup` (
+  `filename` text NOT NULL,
+  `mark` mediumint(8) unsigned NOT NULL default '0',
+  `offset` bigint(20) unsigned default NULL,
+  `type` tinyint(4) NOT NULL default '0',
+  KEY `filename` (`filename`(255))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `filemarkup`
+--
+
+LOCK TABLES `filemarkup` WRITE;
+/*!40000 ALTER TABLE `filemarkup` DISABLE KEYS */;
+/*!40000 ALTER TABLE `filemarkup` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `gallerymetadata`
+--
+
+DROP TABLE IF EXISTS `gallerymetadata`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `gallerymetadata` (
+  `image` varchar(255) NOT NULL,
+  `angle` int(11) NOT NULL,
+  PRIMARY KEY  (`image`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `gallerymetadata`
+--
+
+LOCK TABLES `gallerymetadata` WRITE;
+/*!40000 ALTER TABLE `gallerymetadata` DISABLE KEYS */;
+/*!40000 ALTER TABLE `gallerymetadata` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `gamemetadata`
+--
+
+DROP TABLE IF EXISTS `gamemetadata`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `gamemetadata` (
+  `system` varchar(128) NOT NULL default '',
+  `romname` varchar(128) NOT NULL default '',
+  `gamename` varchar(128) NOT NULL default '',
+  `genre` varchar(128) NOT NULL default '',
+  `year` varchar(10) NOT NULL default '',
+  `publisher` varchar(128) NOT NULL default '',
+  `favorite` tinyint(1) default NULL,
+  `rompath` varchar(255) NOT NULL default '',
+  `gametype` varchar(64) NOT NULL default '',
+  `diskcount` tinyint(1) NOT NULL default '1',
+  `country` varchar(128) NOT NULL default '',
+  `crc_value` varchar(64) NOT NULL default '',
+  `display` tinyint(1) NOT NULL default '1',
+  `version` varchar(64) NOT NULL default '',
+  KEY `system` (`system`),
+  KEY `year` (`year`),
+  KEY `romname` (`romname`),
+  KEY `gamename` (`gamename`),
+  KEY `genre` (`genre`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `gamemetadata`
+--
+
+LOCK TABLES `gamemetadata` WRITE;
+/*!40000 ALTER TABLE `gamemetadata` DISABLE KEYS */;
+/*!40000 ALTER TABLE `gamemetadata` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `gameplayers`
+--
+
+DROP TABLE IF EXISTS `gameplayers`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `gameplayers` (
+  `gameplayerid` int(10) unsigned NOT NULL auto_increment,
+  `playername` varchar(64) NOT NULL default '',
+  `workingpath` varchar(255) NOT NULL default '',
+  `rompath` varchar(255) NOT NULL default '',
+  `screenshots` varchar(255) NOT NULL default '',
+  `commandline` text NOT NULL,
+  `gametype` varchar(64) NOT NULL default '',
+  `extensions` varchar(128) NOT NULL default '',
+  `spandisks` tinyint(1) NOT NULL default '0',
+  PRIMARY KEY  (`gameplayerid`),
+  UNIQUE KEY `playername` (`playername`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `gameplayers`
+--
+
+LOCK TABLES `gameplayers` WRITE;
+/*!40000 ALTER TABLE `gameplayers` DISABLE KEYS */;
+/*!40000 ALTER TABLE `gameplayers` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `housekeeping`
+--
+
+DROP TABLE IF EXISTS `housekeeping`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `housekeeping` (
+  `tag` varchar(64) NOT NULL default '',
+  `lastrun` datetime default NULL,
+  PRIMARY KEY  (`tag`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `housekeeping`
+--
+
+LOCK TABLES `housekeeping` WRITE;
+/*!40000 ALTER TABLE `housekeeping` DISABLE KEYS */;
+/*!40000 ALTER TABLE `housekeeping` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `inputgroup`
+--
+
+DROP TABLE IF EXISTS `inputgroup`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `inputgroup` (
+  `cardinputid` int(10) unsigned NOT NULL,
+  `inputgroupid` int(10) unsigned NOT NULL,
+  `inputgroupname` varchar(32) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `inputgroup`
+--
+
+LOCK TABLES `inputgroup` WRITE;
+/*!40000 ALTER TABLE `inputgroup` DISABLE KEYS */;
+/*!40000 ALTER TABLE `inputgroup` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `inuseprograms`
+--
+
+DROP TABLE IF EXISTS `inuseprograms`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `inuseprograms` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `recusage` varchar(128) NOT NULL default '',
+  `lastupdatetime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `hostname` varchar(255) NOT NULL default '',
+  `rechost` varchar(64) NOT NULL,
+  `recdir` varchar(255) NOT NULL default '',
+  KEY `chanid` (`chanid`,`starttime`),
+  KEY `recusage` (`recusage`,`lastupdatetime`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `inuseprograms`
+--
+
+LOCK TABLES `inuseprograms` WRITE;
+/*!40000 ALTER TABLE `inuseprograms` DISABLE KEYS */;
+/*!40000 ALTER TABLE `inuseprograms` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `jobqueue`
+--
+
+DROP TABLE IF EXISTS `jobqueue`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `jobqueue` (
+  `id` int(11) NOT NULL auto_increment,
+  `chanid` int(10) NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `inserttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `type` int(11) NOT NULL default '0',
+  `cmds` int(11) NOT NULL default '0',
+  `flags` int(11) NOT NULL default '0',
+  `status` int(11) NOT NULL default '0',
+  `statustime` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  `hostname` varchar(255) NOT NULL default '',
+  `args` blob NOT NULL,
+  `comment` varchar(128) NOT NULL default '',
+  `schedruntime` datetime NOT NULL default '2007-01-01 00:00:00',
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `chanid` (`chanid`,`starttime`,`type`,`inserttime`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `jobqueue`
+--
+
+LOCK TABLES `jobqueue` WRITE;
+/*!40000 ALTER TABLE `jobqueue` DISABLE KEYS */;
+/*!40000 ALTER TABLE `jobqueue` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `jumppoints`
+--
+
+DROP TABLE IF EXISTS `jumppoints`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `jumppoints` (
+  `destination` varchar(128) NOT NULL default '',
+  `description` varchar(255) default NULL,
+  `keylist` varchar(128) default NULL,
+  `hostname` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`destination`,`hostname`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `jumppoints`
+--
+
+LOCK TABLES `jumppoints` WRITE;
+/*!40000 ALTER TABLE `jumppoints` DISABLE KEYS */;
+INSERT INTO `jumppoints` (`destination`, `description`, `keylist`, `hostname`) VALUES ('Reload Theme','','','larch5'),('Main Menu','','','larch5'),('Program Guide','','','larch5'),('Program Finder','','','larch5'),('Manage Recordings / Fix Conflicts','','','larch5'),('Program Recording Priorities','','','larch5'),('Channel Recording Priorities','','','larch5'),('TV Recording Playback','','','larch5'),('TV Recording Deletion','','','larch5'),('Live TV','','','larch5'),('Live TV In Guide','','','larch5'),('Manual Record Scheduling','','','larch5'),('Status Screen','','','larch5'),('Previously Recorded','','','larch5'),('Netflix Browser','Browse Netflix titles','','larch5'),('Netflix Queue','Administer Netflix Queue','','larch5'),('Netflix History','View Netflix History','','larch5'),('MythGallery','Image viewer / slideshow','','larch5'),('MythGame','Game frontend','','larch5'),('Play music','','','larch5'),('Select music playlists','','','larch5'),('Rip CD','','','larch5'),('Scan music','','','larch5'),('Show Music Miniplayer','','','larch5'),('MythNews','RSS News feed reader','','larch5'),('MythVideo','The MythVideo default view','','larch5'),('Video Manager','The MythVideo video manager','','larch5'),('Video Browser','The MythVideo video browser','','larch5'),('Video Listings','The MythVideo video listings','','larch5'),('Video Gallery','The MythVideo video gallery','','larch5'),('Play DVD','Play a DVD','','larch5'),('Play VCD','Play a VCD','','larch5'),('Rip DVD','Import a DVD into your MythVideo database','','larch5'),('MythWeather','Weather forecasts','','larch5');
+/*!40000 ALTER TABLE `jumppoints` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `keybindings`
+--
+
+DROP TABLE IF EXISTS `keybindings`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `keybindings` (
+  `context` varchar(32) NOT NULL default '',
+  `action` varchar(32) NOT NULL default '',
+  `description` varchar(255) default NULL,
+  `keylist` varchar(128) default NULL,
+  `hostname` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`context`,`action`,`hostname`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `keybindings`
+--
+
+LOCK TABLES `keybindings` WRITE;
+/*!40000 ALTER TABLE `keybindings` DISABLE KEYS */;
+INSERT INTO `keybindings` (`context`, `action`, `description`, `keylist`, `hostname`) VALUES ('Global','UP','Up Arrow','Up','larch5'),('Global','DOWN','Down Arrow','Down','larch5'),('Global','LEFT','Left Arrow','Left','larch5'),('Global','RIGHT','Right Arrow','Right','larch5'),('Global','SELECT','Select','Return,Enter,Space','larch5'),('Global','ESCAPE','Escape','Esc','larch5'),('Global','MENU','Pop-up menu','M','larch5'),('Global','INFO','More information','I','larch5'),('Global','PAGEUP','Page Up','PgUp','larch5'),('Global','PAGEDOWN','Page Down','PgDown','larch5'),('Global','PREVVIEW','Previous View','Home','larch5'),('Global','NEXTVIEW','Next View','End','larch5'),('Global','HELP','Help','F1','larch5'),('Global','EJECT','Eject Removable Media','','larch5'),('Global','0','0','0','larch5'),('Global','1','1','1','larch5'),('Global','2','2','2','larch5'),('Global','3','3','3','larch5'),('Global','4','4','4','larch5'),('Global','5','5','5','larch5'),('Global','6','6','6','larch5'),('Global','7','7','7','larch5'),('Global','8','8','8','larch5'),('Global','9','9','9','larch5'),('qt','DELETE','Delete','D','larch5'),('qt','EDIT','Edit','E','larch5'),('TV Frontend','PAGEUP','Page Up','3','larch5'),('TV Frontend','PAGEDOWN','Page Down','9','larch5'),('TV Frontend','PAGETOP','Page to top of list','','larch5'),('TV Frontend','PAGEMIDDLE','Page to middle of list','','larch5'),('TV Frontend','PAGEBOTTOM','Page to bottom of list','','larch5'),('TV Frontend','DELETE','Delete Program','D','larch5'),('TV Frontend','PLAYBACK','Play Program','P','larch5'),('TV Frontend','TOGGLERECORD','Toggle recording status of current program','R','larch5'),('TV Frontend','DAYLEFT','Page the program guide back one day','Home,7','larch5'),('TV Frontend','DAYRIGHT','Page the program guide forward one day','End,1','larch5'),('TV Frontend','PAGELEFT','Page the program guide left',',,<','larch5'),('TV Frontend','PAGERIGHT','Page the program guide right','>,.','larch5'),('TV Frontend','TOGGLEFAV','Toggle the current channel as a favorite','?','larch5'),('TV Frontend','TOGGLEEPGORDER','Reverse the channel order in the program guide','0','larch5'),('TV Frontend','GUIDE','Show the Program Guide','S','larch5'),('TV Frontend','FINDER','Show the Program Finder','#','larch5'),('TV Frontend','NEXTFAV','Toggle showing all channels or just favorites in the program guide.','/','larch5'),('TV Frontend','CHANUPDATE','Switch channels without exiting guide in Live TV mode.','X','larch5'),('TV Frontend','VOLUMEDOWN','Volume down','[,{,F10,Volume Down','larch5'),('TV Frontend','VOLUMEUP','Volume up','],},F11,Volume Up','larch5'),('TV Frontend','MUTE','Mute','|,\\,F9,Volume Mute','larch5'),('TV Frontend','RANKINC','Increase program or channel rank','Right','larch5'),('TV Frontend','RANKDEC','Decrease program or channel rank','Left','larch5'),('TV Frontend','UPCOMING','List upcoming episodes','O','larch5'),('TV Frontend','DETAILS','Show program details','U','larch5'),('TV Frontend','VIEWCARD','Switch Capture Card view','Y','larch5'),('TV Frontend','VIEWINPUT','Switch Capture Card view','C','larch5'),('TV Frontend','CUSTOMEDIT','Edit Custom Record Rule','E','larch5'),('TV Frontend','CHANGERECGROUP','Change Recording Group','','larch5'),('TV Frontend','CHANGEGROUPVIEW','Change Group View','','larch5'),('TV Playback','CLEAROSD','Clear OSD','Backspace','larch5'),('TV Playback','PAUSE','Pause','P','larch5'),('TV Playback','DELETE','Delete Program','D','larch5'),('TV Playback','SEEKFFWD','Fast Forward','Right','larch5'),('TV Playback','SEEKRWND','Rewind','Left','larch5'),('TV Playback','ARBSEEK','Arbitrary Seek','*','larch5'),('TV Playback','CHANNELUP','Channel up','Up','larch5'),('TV Playback','CHANNELDOWN','Channel down','Down','larch5'),('TV Playback','NEXTFAV','Switch to the next favorite channel','/','larch5'),('TV Playback','PREVCHAN','Switch to the previous channel','H','larch5'),('TV Playback','JUMPFFWD','Jump ahead','PgDown','larch5'),('TV Playback','JUMPRWND','Jump back','PgUp','larch5'),('TV Playback','JUMPBKMRK','Jump to bookmark','K','larch5'),('TV Playback','FFWDSTICKY','Fast Forward (Sticky) or Forward one frame while paused','>,.','larch5'),('TV Playback','RWNDSTICKY','Rewind (Sticky) or Rewind one frame while paused',',,<','larch5'),('TV Playback','NEXTSOURCE','Next Video Source','Y','larch5'),('TV Playback','PREVSOURCE','Previous Video Source','Ctrl+Y','larch5'),('TV Playback','NEXTINPUT','Next Input','C','larch5'),('TV Playback','NEXTCARD','Next Card','','larch5'),('TV Playback','SKIPCOMMERCIAL','Skip Commercial','Z,End','larch5'),('TV Playback','SKIPCOMMBACK','Skip Commercial (Reverse)','Q,Home','larch5'),('TV Playback','JUMPSTART','Jump to the start of the recording.','Ctrl+B','larch5'),('TV Playback','TOGGLEBROWSE','Toggle channel browse mode','O','larch5'),('TV Playback','TOGGLERECORD','Toggle recording status of current program','R','larch5'),('TV Playback','TOGGLEFAV','Toggle the current channel as a favorite','?','larch5'),('TV Playback','VOLUMEDOWN','Volume down','[,{,F10,Volume Down','larch5'),('TV Playback','VOLUMEUP','Volume up','],},F11,Volume Up','larch5'),('TV Playback','MUTE','Mute','|,\\,F9,Volume Mute','larch5'),('TV Playback','TOGGLEPIPMODE','Toggle Picture-in-Picture mode','V','larch5'),('TV Playback','TOGGLEPIPWINDOW','Toggle active PiP window','B','larch5'),('TV Playback','SWAPPIP','Swap PiP/Main','N','larch5'),('TV Playback','TOGGLEASPECT','Toggle the video aspect ratio','Ctrl+W','larch5'),('TV Playback','TOGGLEFILL','Next Preconfigured Zoom mode','W','larch5'),('TV Playback','TOGGLECC','Toggle any captions','T','larch5'),('TV Playback','TOGGLETTC','Toggle Teletext Captions','','larch5'),('TV Playback','TOGGLESUBTITLE','Toggle Subtitles','','larch5'),('TV Playback','TOGGLECC608','Toggle VBI CC','','larch5'),('TV Playback','TOGGLECC708','Toggle ATSC CC','','larch5'),('TV Playback','TOGGLETTM','Toggle Teletext Menu','','larch5'),('TV Playback','SELECTAUDIO_0','Play audio track 1','','larch5'),('TV Playback','SELECTAUDIO_1','Play audio track 2','','larch5'),('TV Playback','SELECTSUBTITLE_0','Display subtitle 1','','larch5'),('TV Playback','SELECTSUBTITLE_1','Display subtitle 2','','larch5'),('TV Playback','SELECTCC608_0','Display VBI CC1','','larch5'),('TV Playback','SELECTCC608_1','Display VBI CC2','','larch5'),('TV Playback','SELECTCC608_2','Display VBI CC3','','larch5'),('TV Playback','SELECTCC608_3','Display VBI CC4','','larch5'),('TV Playback','SELECTCC708_0','Display ATSC CC1','','larch5'),('TV Playback','SELECTCC708_1','Display ATSC CC2','','larch5'),('TV Playback','SELECTCC708_2','Display ATSC CC3','','larch5'),('TV Playback','SELECTCC708_3','Display ATSC CC4','','larch5'),('TV Playback','NEXTAUDIO','Next audio track','+','larch5'),('TV Playback','PREVAUDIO','Previous audio track','-','larch5'),('TV Playback','NEXTSUBTITLE','Next subtitle track','','larch5'),('TV Playback','PREVSUBTITLE','Previous subtitle track','','larch5'),('TV Playback','NEXTCC608','Next VBI CC track','','larch5'),('TV Playback','PREVCC608','Previous VBI CC track','','larch5'),('TV Playback','NEXTCC708','Next ATSC CC track','','larch5'),('TV Playback','PREVCC708','Previous ATSC CC track','','larch5'),('TV Playback','NEXTCC','Next of any captions','','larch5'),('TV Playback','NEXTSCAN','Next video scan overidemode','','larch5'),('TV Playback','QUEUETRANSCODE','Queue the current recording for transcoding','X','larch5'),('TV Playback','SPEEDINC','Increase the playback speed','U','larch5'),('TV Playback','SPEEDDEC','Decrease the playback speed','J','larch5'),('TV Playback','ADJUSTSTRETCH','Turn on time stretch control','A','larch5'),('TV Playback','STRETCHINC','Increase time stretch speed','','larch5'),('TV Playback','STRETCHDEC','Decrease time stretch speed','','larch5'),('TV Playback','TOGGLESTRETCH','Toggle time stretch speed','','larch5'),('TV Playback','TOGGLEAUDIOSYNC','Turn on audio sync adjustment controls','','larch5'),('TV Playback','TOGGLEPICCONTROLS','Playback picture adjustments','F','larch5'),('TV Playback','TOGGLECHANCONTROLS','Recording picture adjustments for this channel','Ctrl+G','larch5'),('TV Playback','TOGGLERECCONTROLS','Recording picture adjustments for this recorder','G','larch5'),('TV Playback','TOGGLEEDIT','Start Edit Mode','E','larch5'),('TV Playback','CYCLECOMMSKIPMODE','Cycle Commercial Skip mode','','larch5'),('TV Playback','GUIDE','Show the Program Guide','S','larch5'),('TV Playback','FINDER','Show the Program Finder','#','larch5'),('TV Playback','TOGGLESLEEP','Toggle the Sleep Timer','F8','larch5'),('TV Playback','PLAY','Play','Ctrl+P','larch5'),('TV Playback','JUMPPREV','Jump to previously played recording','','larch5'),('TV Playback','JUMPREC','Display menu of recorded programs to jump to','','larch5'),('TV Playback','VIEWSCHEDULED','Display scheduled recording list','','larch5'),('TV Playback','SIGNALMON','Monitor Signal Quality','Alt+F7','larch5'),('TV Playback','JUMPTODVDROOTMENU','Jump to the DVD Root Menu','','larch5'),('TV Playback','EXITSHOWNOPROMPTS','Exit Show without any prompts','','larch5'),('TV Playback','SCREENSHOT','Save screenshot of current video frame','','larch5'),('TV Playback','MENURED','Menu Red','F2','larch5'),('TV Playback','MENUGREEN','Menu Green','F3','larch5'),('TV Playback','MENUYELLOW','Menu Yellow','F4','larch5'),('TV Playback','MENUBLUE','Menu Blue','F5','larch5'),('TV Playback','TEXTEXIT','Menu Exit','F6','larch5'),('TV Playback','MENUTEXT','Menu Text','F7','larch5'),('TV Playback','MENUEPG','Menu EPG','F12','larch5'),('TV Editing','CLEARMAP','Clear editing cut points','C,Q,Home','larch5'),('TV Editing','INVERTMAP','Invert Begin/End cut points','I','larch5'),('TV Editing','LOADCOMMSKIP','Load cut list from commercial skips','Z,End','larch5'),('TV Editing','NEXTCUT','Jump to the next cut point','PgDown','larch5'),('TV Editing','PREVCUT','Jump to the previous cut point','PgUp','larch5'),('TV Editing','BIGJUMPREW','Jump back 10x the normal amount',',,<','larch5'),('TV Editing','BIGJUMPFWD','Jump forward 10x the normal amount','>,.','larch5'),('TV Editing','TOGGLEEDIT','Exit out of Edit Mode','E','larch5'),('Teletext Menu','NEXTPAGE','Next Page','Down','larch5'),('Teletext Menu','PREVPAGE','Previous Page','Up','larch5'),('Teletext Menu','NEXTSUBPAGE','Next Subpage','Right','larch5'),('Teletext Menu','PREVSUBPAGE','Previous Subpage','Left','larch5'),('Teletext Menu','TOGGLETT','Toggle Teletext','T','larch5'),('Teletext Menu','MENURED','Menu Red','F2','larch5'),('Teletext Menu','MENUGREEN','Menu Green','F3','larch5'),('Teletext Menu','MENUYELLOW','Menu Yellow','F4','larch5'),('Teletext Menu','MENUBLUE','Menu Blue','F5','larch5'),('Teletext Menu','MENUWHITE','Menu White','F6','larch5'),('Teletext Menu','TOGGLEBACKGROUND','Toggle Background','F7','larch5'),('Teletext Menu','REVEAL','Reveal hidden Text','F8','larch5'),('Archive','TOGGLECUT','Toggle use cut list state for selected program','C','larch5'),('NetFlix','MOVETOTOP','Moves movie to top of queue','1','larch5'),('NetFlix','REMOVE','Removes movie from queue','D','larch5'),('Gallery','PLAY','Start/Stop Slideshow','P','larch5'),('Gallery','HOME','Go to the first image in thumbnail view','Home','larch5'),('Gallery','END','Go to the last image in thumbnail view','End','larch5'),('Gallery','MENU','Toggle activating menu in thumbnail view','M','larch5'),('Gallery','SLIDESHOW','Start Slideshow in thumbnail view','S','larch5'),('Gallery','RANDOMSHOW','Start Random Slideshow in thumbnail view','R','larch5'),('Gallery','ROTRIGHT','Rotate image right 90 degrees','],3','larch5'),('Gallery','ROTLEFT','Rotate image left 90 degrees','[,1','larch5'),('Gallery','ZOOMOUT','Zoom image out','7','larch5'),('Gallery','ZOOMIN','Zoom image in','9','larch5'),('Gallery','SCROLLUP','Scroll image up','2','larch5'),('Gallery','SCROLLLEFT','Scroll image left','4','larch5'),('Gallery','SCROLLRIGHT','Scroll image right','6','larch5'),('Gallery','SCROLLDOWN','Scroll image down','8','larch5'),('Gallery','RECENTER','Recenter image','5','larch5'),('Gallery','FULLSIZE','Full-size (un-zoom) image','0','larch5'),('Gallery','UPLEFT','Go to the upper-left corner of the image','PgUp','larch5'),('Gallery','LOWRIGHT','Go to the lower-right corner of the image','PgDown','larch5'),('Gallery','INFO','Toggle Showing Information about Image','I','larch5'),('Gallery','DELETE','Delete marked images or current image if none are marked','D','larch5'),('Gallery','MARK','Mark image','T','larch5'),('Gallery','FULLSCREEN','Toggle scale to fullscreen/scale to fit','W','larch5'),('Game','TOGGLEFAV','Toggle the current game as a favorite','?,/','larch5'),('Game','INCSEARCH','Show incremental search dialog','Ctrl+S','larch5'),('Game','INCSEARCHNEXT','Incremental search find next match','Ctrl+N','larch5'),('Music','DELETE','Delete track from playlist','D','larch5'),('Music','NEXTTRACK','Move to the next track','>,.,Z,End','larch5'),('Music','PREVTRACK','Move to the previous track',',,<,Q,Home','larch5'),('Music','FFWD','Fast forward','PgDown','larch5'),('Music','RWND','Rewind','PgUp','larch5'),('Music','PAUSE','Pause/Start playback','P','larch5'),('Music','PLAY','Start playback','','larch5'),('Music','STOP','Stop playback','O','larch5'),('Music','VOLUMEDOWN','Volume down','[,{,F10,Volume Down','larch5'),('Music','VOLUMEUP','Volume up','],},F11,Volume Up','larch5'),('Music','MUTE','Mute','|,\\,F9,Volume Mute','larch5'),('Music','CYCLEVIS','Cycle visualizer mode','6','larch5'),('Music','BLANKSCR','Blank screen','5','larch5'),('Music','THMBUP','Increase rating','9','larch5'),('Music','THMBDOWN','Decrease rating','7','larch5'),('Music','REFRESH','Refresh music tree','8','larch5'),('Music','FILTER','Filter All My Music','F','larch5'),('Music','INCSEARCH','Show incremental search dialog','Ctrl+S','larch5'),('Music','INCSEARCHNEXT','Incremental search find next match','Ctrl+N','larch5'),('Music','SPEEDUP','Increase Play Speed','W','larch5'),('Music','SPEEDDOWN','Decrease Play Speed','X','larch5'),('News','RETRIEVENEWS','Update news items','I','larch5'),('News','FORCERETRIEVE','Force update news items','M','larch5'),('News','CANCEL','Cancel news item updating','C','larch5'),('Phone','0','0','0','larch5'),('Phone','1','1','1','larch5'),('Phone','2','2','2','larch5'),('Phone','3','3','3','larch5'),('Phone','4','4','4','larch5'),('Phone','5','5','5','larch5'),('Phone','6','6','6','larch5'),('Phone','7','7','7','larch5'),('Phone','8','8','8','larch5'),('Phone','9','9','9','larch5'),('Phone','HASH','HASH','#','larch5'),('Phone','STAR','STAR','*','larch5'),('Phone','Up','Up','Up','larch5'),('Phone','Down','Down','Down','larch5'),('Phone','Left','Left','Left','larch5'),('Phone','Right','Right','Right','larch5'),('Phone','VOLUMEDOWN','Volume down','[,{,F10,Volume Down','larch5'),('Phone','VOLUMEUP','Volume up','],},F11,Volume Up','larch5'),('Phone','MUTE','Mute','|,\\,F9,Volume Mute','larch5'),('Phone','ZOOMIN','Zoom the video window in','>,.,Z,End','larch5'),('Phone','ZOOMOUT','Zoom the video window out',',,<,Q,Home','larch5'),('Phone','FULLSCRN','Show received video full-screen','P','larch5'),('Phone','HANGUP','Hangup an active call','O','larch5'),('Phone','LOOPBACK','Loopback Video','L','larch5'),('Video','FILTER','Open video filter dialog','F','larch5'),('Video','DELETE','Delete video','D','larch5'),('Video','BROWSE','Change browsable in video manager','B','larch5'),('Video','INCPARENT','Increase Parental Level','],},F11','larch5'),('Video','DECPARENT','Decrease Parental Level','[,{,F10','larch5'),('Video','HOME','Go to the first video','Home','larch5'),('Video','END','Go to the last video','End','larch5'),('Weather','PAUSE','Pause current page','P','larch5'),('Weather','SEARCH','Search List','/','larch5'),('Weather','NEXTSEARCH','Search List','n','larch5'),('Weather','UPDATE','Search List','u','larch5'),('Weather','DELETE','Delete screen from list','D','larch5');
+/*!40000 ALTER TABLE `keybindings` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `keyword`
+--
+
+DROP TABLE IF EXISTS `keyword`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `keyword` (
+  `phrase` varchar(128) NOT NULL default '',
+  `searchtype` int(10) unsigned NOT NULL default '3',
+  UNIQUE KEY `phrase` (`phrase`,`searchtype`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `keyword`
+--
+
+LOCK TABLES `keyword` WRITE;
+/*!40000 ALTER TABLE `keyword` DISABLE KEYS */;
+/*!40000 ALTER TABLE `keyword` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_albumart`
+--
+
+DROP TABLE IF EXISTS `music_albumart`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_albumart` (
+  `albumart_id` int(20) NOT NULL auto_increment,
+  `filename` varchar(255) NOT NULL default '',
+  `directory_id` int(20) NOT NULL default '0',
+  `imagetype` tinyint(3) NOT NULL default '0',
+  `song_id` int(11) NOT NULL default '0',
+  `embedded` tinyint(1) NOT NULL default '0',
+  PRIMARY KEY  (`albumart_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_albumart`
+--
+
+LOCK TABLES `music_albumart` WRITE;
+/*!40000 ALTER TABLE `music_albumart` DISABLE KEYS */;
+/*!40000 ALTER TABLE `music_albumart` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_albums`
+--
+
+DROP TABLE IF EXISTS `music_albums`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_albums` (
+  `album_id` int(11) unsigned NOT NULL auto_increment,
+  `artist_id` int(11) unsigned NOT NULL default '0',
+  `album_name` varchar(255) NOT NULL default '',
+  `year` smallint(6) NOT NULL default '0',
+  `compilation` tinyint(1) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`album_id`),
+  KEY `idx_album_name` (`album_name`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_albums`
+--
+
+LOCK TABLES `music_albums` WRITE;
+/*!40000 ALTER TABLE `music_albums` DISABLE KEYS */;
+/*!40000 ALTER TABLE `music_albums` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_artists`
+--
+
+DROP TABLE IF EXISTS `music_artists`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_artists` (
+  `artist_id` int(11) unsigned NOT NULL auto_increment,
+  `artist_name` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`artist_id`),
+  KEY `idx_artist_name` (`artist_name`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_artists`
+--
+
+LOCK TABLES `music_artists` WRITE;
+/*!40000 ALTER TABLE `music_artists` DISABLE KEYS */;
+/*!40000 ALTER TABLE `music_artists` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_directories`
+--
+
+DROP TABLE IF EXISTS `music_directories`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_directories` (
+  `directory_id` int(20) NOT NULL auto_increment,
+  `path` text NOT NULL,
+  `parent_id` int(20) NOT NULL default '0',
+  PRIMARY KEY  (`directory_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_directories`
+--
+
+LOCK TABLES `music_directories` WRITE;
+/*!40000 ALTER TABLE `music_directories` DISABLE KEYS */;
+/*!40000 ALTER TABLE `music_directories` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_genres`
+--
+
+DROP TABLE IF EXISTS `music_genres`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_genres` (
+  `genre_id` int(11) unsigned NOT NULL auto_increment,
+  `genre` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`genre_id`),
+  KEY `idx_genre` (`genre`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_genres`
+--
+
+LOCK TABLES `music_genres` WRITE;
+/*!40000 ALTER TABLE `music_genres` DISABLE KEYS */;
+/*!40000 ALTER TABLE `music_genres` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_playlists`
+--
+
+DROP TABLE IF EXISTS `music_playlists`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_playlists` (
+  `playlist_id` int(11) unsigned NOT NULL auto_increment,
+  `playlist_name` varchar(255) NOT NULL default '',
+  `playlist_songs` text NOT NULL,
+  `last_accessed` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  `length` int(11) unsigned NOT NULL default '0',
+  `songcount` smallint(8) unsigned NOT NULL default '0',
+  `hostname` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`playlist_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_playlists`
+--
+
+LOCK TABLES `music_playlists` WRITE;
+/*!40000 ALTER TABLE `music_playlists` DISABLE KEYS */;
+/*!40000 ALTER TABLE `music_playlists` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_smartplaylist_categories`
+--
+
+DROP TABLE IF EXISTS `music_smartplaylist_categories`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_smartplaylist_categories` (
+  `categoryid` int(10) unsigned NOT NULL auto_increment,
+  `name` varchar(128) NOT NULL,
+  PRIMARY KEY  (`categoryid`),
+  KEY `name` (`name`)
+) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_smartplaylist_categories`
+--
+
+LOCK TABLES `music_smartplaylist_categories` WRITE;
+/*!40000 ALTER TABLE `music_smartplaylist_categories` DISABLE KEYS */;
+INSERT INTO `music_smartplaylist_categories` (`categoryid`, `name`) VALUES (1,'Decades'),(2,'Favourite Tracks'),(3,'New Tracks');
+/*!40000 ALTER TABLE `music_smartplaylist_categories` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_smartplaylist_items`
+--
+
+DROP TABLE IF EXISTS `music_smartplaylist_items`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_smartplaylist_items` (
+  `smartplaylistitemid` int(10) unsigned NOT NULL auto_increment,
+  `smartplaylistid` int(10) unsigned NOT NULL,
+  `field` varchar(50) NOT NULL,
+  `operator` varchar(20) NOT NULL,
+  `value1` varchar(255) NOT NULL,
+  `value2` varchar(255) NOT NULL,
+  PRIMARY KEY  (`smartplaylistitemid`),
+  KEY `smartplaylistid` (`smartplaylistid`)
+) ENGINE=MyISAM AUTO_INCREMENT=9 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_smartplaylist_items`
+--
+
+LOCK TABLES `music_smartplaylist_items` WRITE;
+/*!40000 ALTER TABLE `music_smartplaylist_items` DISABLE KEYS */;
+INSERT INTO `music_smartplaylist_items` (`smartplaylistitemid`, `smartplaylistid`, `field`, `operator`, `value1`, `value2`) VALUES (1,1,'Year','is between','1960','1969'),(2,2,'Year','is between','1970','1979'),(3,3,'Year','is between','1980','1989'),(4,4,'Year','is between','1990','1999'),(5,5,'Year','is between','2000','2009'),(6,6,'Rating','is greater than','7','0'),(7,7,'Play Count','is greater than','0','0'),(8,8,'Play Count','is equal to','0','0');
+/*!40000 ALTER TABLE `music_smartplaylist_items` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_smartplaylists`
+--
+
+DROP TABLE IF EXISTS `music_smartplaylists`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_smartplaylists` (
+  `smartplaylistid` int(10) unsigned NOT NULL auto_increment,
+  `name` varchar(128) NOT NULL,
+  `categoryid` int(10) unsigned NOT NULL,
+  `matchtype` set('All','Any') NOT NULL default 'All',
+  `orderby` varchar(128) NOT NULL default '',
+  `limitto` int(10) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`smartplaylistid`),
+  KEY `name` (`name`),
+  KEY `categoryid` (`categoryid`)
+) ENGINE=MyISAM AUTO_INCREMENT=9 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_smartplaylists`
+--
+
+LOCK TABLES `music_smartplaylists` WRITE;
+/*!40000 ALTER TABLE `music_smartplaylists` DISABLE KEYS */;
+INSERT INTO `music_smartplaylists` (`smartplaylistid`, `name`, `categoryid`, `matchtype`, `orderby`, `limitto`) VALUES (1,'1960\'s',1,'All','Artist (A)',0),(2,'1970\'s',1,'All','Artist (A)',0),(3,'1980\'s',1,'All','Artist (A)',0),(4,'1990\'s',1,'All','Artist (A)',0),(5,'2000\'s',1,'All','Artist (A)',0),(6,'Favorite Tracks',2,'All','Artist (A), Album (A)',0),(7,'100 Most Played Tracks',2,'All','Play Count (D)',100),(8,'Never Played Tracks',3,'All','Artist (A), Album (A)',0);
+/*!40000 ALTER TABLE `music_smartplaylists` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_songs`
+--
+
+DROP TABLE IF EXISTS `music_songs`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_songs` (
+  `song_id` int(11) unsigned NOT NULL auto_increment,
+  `filename` text NOT NULL,
+  `name` varchar(255) NOT NULL default '',
+  `track` smallint(6) unsigned NOT NULL default '0',
+  `artist_id` int(11) unsigned NOT NULL default '0',
+  `album_id` int(11) unsigned NOT NULL default '0',
+  `genre_id` int(11) unsigned NOT NULL default '0',
+  `year` smallint(6) NOT NULL default '0',
+  `length` int(11) unsigned NOT NULL default '0',
+  `numplays` int(11) unsigned NOT NULL default '0',
+  `rating` tinyint(4) unsigned NOT NULL default '0',
+  `lastplay` datetime default NULL,
+  `date_entered` datetime default NULL,
+  `date_modified` datetime default NULL,
+  `format` varchar(4) NOT NULL default '0',
+  `mythdigest` varchar(255) default NULL,
+  `size` bigint(20) unsigned default NULL,
+  `description` varchar(255) default NULL,
+  `comment` varchar(255) default NULL,
+  `disc_count` smallint(5) unsigned default '0',
+  `disc_number` smallint(5) unsigned default '0',
+  `track_count` smallint(5) unsigned default '0',
+  `start_time` int(10) unsigned default '0',
+  `stop_time` int(10) unsigned default NULL,
+  `eq_preset` varchar(255) default NULL,
+  `relative_volume` tinyint(4) default '0',
+  `sample_rate` int(10) unsigned default '0',
+  `bitrate` int(10) unsigned default '0',
+  `bpm` smallint(5) unsigned default NULL,
+  `directory_id` int(20) NOT NULL default '0',
+  PRIMARY KEY  (`song_id`),
+  KEY `idx_name` (`name`),
+  KEY `idx_mythdigest` (`mythdigest`),
+  KEY `directory_id` (`directory_id`),
+  KEY `album_id` (`album_id`),
+  KEY `genre_id` (`genre_id`),
+  KEY `artist_id` (`artist_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_songs`
+--
+
+LOCK TABLES `music_songs` WRITE;
+/*!40000 ALTER TABLE `music_songs` DISABLE KEYS */;
+/*!40000 ALTER TABLE `music_songs` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `music_stats`
+--
+
+DROP TABLE IF EXISTS `music_stats`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `music_stats` (
+  `num_artists` smallint(5) unsigned NOT NULL default '0',
+  `num_albums` smallint(5) unsigned NOT NULL default '0',
+  `num_songs` mediumint(8) unsigned NOT NULL default '0',
+  `num_genres` tinyint(3) unsigned NOT NULL default '0',
+  `total_time` varchar(12) NOT NULL default '0',
+  `total_size` varchar(10) NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `music_stats`
+--
+
+LOCK TABLES `music_stats` WRITE;
+/*!40000 ALTER TABLE `music_stats` DISABLE KEYS */;
+/*!40000 ALTER TABLE `music_stats` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `musicmetadata`
+--
+
+DROP TABLE IF EXISTS `musicmetadata`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `musicmetadata` (
+  `intid` int(10) unsigned NOT NULL auto_increment,
+  `artist` varchar(128) NOT NULL,
+  `compilation_artist` varchar(128) NOT NULL,
+  `album` varchar(128) NOT NULL,
+  `title` varchar(128) NOT NULL,
+  `genre` varchar(128) NOT NULL,
+  `year` int(10) unsigned NOT NULL,
+  `tracknum` int(10) unsigned NOT NULL,
+  `length` int(10) unsigned NOT NULL,
+  `filename` text NOT NULL,
+  `rating` int(10) unsigned NOT NULL default '5',
+  `lastplay` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  `playcount` int(10) unsigned NOT NULL default '0',
+  `mythdigest` varchar(255) default NULL,
+  `size` bigint(20) unsigned default NULL,
+  `date_added` datetime default NULL,
+  `date_modified` datetime default NULL,
+  `format` varchar(4) default NULL,
+  `description` varchar(255) default NULL,
+  `comment` varchar(255) default NULL,
+  `compilation` tinyint(4) default '0',
+  `composer` varchar(255) default NULL,
+  `disc_count` smallint(5) unsigned default '0',
+  `disc_number` smallint(5) unsigned default '0',
+  `track_count` smallint(5) unsigned default '0',
+  `start_time` int(10) unsigned default '0',
+  `stop_time` int(10) unsigned default NULL,
+  `eq_preset` varchar(255) default NULL,
+  `relative_volume` tinyint(4) default '0',
+  `sample_rate` int(10) unsigned default NULL,
+  `bpm` smallint(5) unsigned default NULL,
+  PRIMARY KEY  (`intid`),
+  KEY `artist` (`artist`),
+  KEY `album` (`album`),
+  KEY `title` (`title`),
+  KEY `genre` (`genre`),
+  KEY `mythdigest` (`mythdigest`),
+  KEY `compilation_artist` (`compilation_artist`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `musicmetadata`
+--
+
+LOCK TABLES `musicmetadata` WRITE;
+/*!40000 ALTER TABLE `musicmetadata` DISABLE KEYS */;
+/*!40000 ALTER TABLE `musicmetadata` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `musicplaylist`
+--
+
+DROP TABLE IF EXISTS `musicplaylist`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `musicplaylist` (
+  `playlistid` int(10) unsigned NOT NULL auto_increment,
+  `name` varchar(128) NOT NULL,
+  `hostname` varchar(255) default NULL,
+  `songlist` text NOT NULL,
+  PRIMARY KEY  (`playlistid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `musicplaylist`
+--
+
+LOCK TABLES `musicplaylist` WRITE;
+/*!40000 ALTER TABLE `musicplaylist` DISABLE KEYS */;
+/*!40000 ALTER TABLE `musicplaylist` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `mythlog`
+--
+
+DROP TABLE IF EXISTS `mythlog`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `mythlog` (
+  `logid` int(10) unsigned NOT NULL auto_increment,
+  `module` varchar(32) NOT NULL default '',
+  `priority` int(11) NOT NULL default '0',
+  `acknowledged` tinyint(1) default '0',
+  `logdate` datetime default NULL,
+  `host` varchar(128) default NULL,
+  `message` varchar(255) NOT NULL default '',
+  `details` text,
+  PRIMARY KEY  (`logid`),
+  KEY `module` (`module`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `mythlog`
+--
+
+LOCK TABLES `mythlog` WRITE;
+/*!40000 ALTER TABLE `mythlog` DISABLE KEYS */;
+/*!40000 ALTER TABLE `mythlog` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `netflix`
+--
+
+DROP TABLE IF EXISTS `netflix`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `netflix` (
+  `name` varchar(100) NOT NULL,
+  `category` varchar(255) NOT NULL,
+  `url` varchar(255) NOT NULL,
+  `ico` varchar(255) default NULL,
+  `updated` int(10) unsigned default NULL,
+  `is_queue` int(10) unsigned default NULL,
+  `queue` varchar(32) NOT NULL default '',
+  PRIMARY KEY  (`name`,`queue`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `netflix`
+--
+
+LOCK TABLES `netflix` WRITE;
+/*!40000 ALTER TABLE `netflix` DISABLE KEYS */;
+/*!40000 ALTER TABLE `netflix` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `networkiconmap`
+--
+
+DROP TABLE IF EXISTS `networkiconmap`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `networkiconmap` (
+  `id` int(11) NOT NULL auto_increment,
+  `network` varchar(20) NOT NULL default '',
+  `url` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `network` (`network`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `networkiconmap`
+--
+
+LOCK TABLES `networkiconmap` WRITE;
+/*!40000 ALTER TABLE `networkiconmap` DISABLE KEYS */;
+/*!40000 ALTER TABLE `networkiconmap` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `oldfind`
+--
+
+DROP TABLE IF EXISTS `oldfind`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `oldfind` (
+  `recordid` int(11) NOT NULL default '0',
+  `findid` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`recordid`,`findid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `oldfind`
+--
+
+LOCK TABLES `oldfind` WRITE;
+/*!40000 ALTER TABLE `oldfind` DISABLE KEYS */;
+/*!40000 ALTER TABLE `oldfind` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `oldprogram`
+--
+
+DROP TABLE IF EXISTS `oldprogram`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `oldprogram` (
+  `oldtitle` varchar(128) NOT NULL default '',
+  `airdate` datetime NOT NULL default '0000-00-00 00:00:00',
+  PRIMARY KEY  (`oldtitle`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `oldprogram`
+--
+
+LOCK TABLES `oldprogram` WRITE;
+/*!40000 ALTER TABLE `oldprogram` DISABLE KEYS */;
+/*!40000 ALTER TABLE `oldprogram` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `oldrecorded`
+--
+
+DROP TABLE IF EXISTS `oldrecorded`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `oldrecorded` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `endtime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `title` varchar(128) NOT NULL default '',
+  `subtitle` varchar(128) NOT NULL default '',
+  `description` text NOT NULL,
+  `category` varchar(64) NOT NULL default '',
+  `seriesid` varchar(40) NOT NULL default '',
+  `programid` varchar(40) NOT NULL default '',
+  `findid` int(11) NOT NULL default '0',
+  `recordid` int(11) NOT NULL default '0',
+  `station` varchar(20) NOT NULL default '',
+  `rectype` int(10) unsigned NOT NULL default '0',
+  `duplicate` tinyint(1) NOT NULL default '0',
+  `recstatus` int(11) NOT NULL default '0',
+  `reactivate` smallint(6) NOT NULL default '0',
+  `generic` tinyint(1) default '0',
+  PRIMARY KEY  (`station`,`starttime`,`title`),
+  KEY `endtime` (`endtime`),
+  KEY `title` (`title`),
+  KEY `seriesid` (`seriesid`),
+  KEY `programid` (`programid`),
+  KEY `recordid` (`recordid`),
+  KEY `recstatus` (`recstatus`,`programid`,`seriesid`),
+  KEY `recstatus_2` (`recstatus`,`title`,`subtitle`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `oldrecorded`
+--
+
+LOCK TABLES `oldrecorded` WRITE;
+/*!40000 ALTER TABLE `oldrecorded` DISABLE KEYS */;
+/*!40000 ALTER TABLE `oldrecorded` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `people`
+--
+
+DROP TABLE IF EXISTS `people`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `people` (
+  `person` mediumint(8) unsigned NOT NULL auto_increment,
+  `name` char(128) NOT NULL default '',
+  PRIMARY KEY  (`person`),
+  UNIQUE KEY `name` (`name`(41))
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `people`
+--
+
+LOCK TABLES `people` WRITE;
+/*!40000 ALTER TABLE `people` DISABLE KEYS */;
+/*!40000 ALTER TABLE `people` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `phonecallhistory`
+--
+
+DROP TABLE IF EXISTS `phonecallhistory`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `phonecallhistory` (
+  `recid` int(10) unsigned NOT NULL auto_increment,
+  `displayname` text NOT NULL,
+  `url` text NOT NULL,
+  `timestamp` text NOT NULL,
+  `duration` int(10) unsigned NOT NULL,
+  `directionin` int(10) unsigned NOT NULL,
+  `directoryref` int(10) unsigned default NULL,
+  PRIMARY KEY  (`recid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `phonecallhistory`
+--
+
+LOCK TABLES `phonecallhistory` WRITE;
+/*!40000 ALTER TABLE `phonecallhistory` DISABLE KEYS */;
+/*!40000 ALTER TABLE `phonecallhistory` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `phonedirectory`
+--
+
+DROP TABLE IF EXISTS `phonedirectory`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `phonedirectory` (
+  `intid` int(10) unsigned NOT NULL auto_increment,
+  `nickname` text NOT NULL,
+  `firstname` text,
+  `surname` text,
+  `url` text NOT NULL,
+  `directory` text NOT NULL,
+  `photofile` text,
+  `speeddial` int(10) unsigned NOT NULL,
+  `onhomelan` int(10) unsigned default '0',
+  PRIMARY KEY  (`intid`)
+) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `phonedirectory`
+--
+
+LOCK TABLES `phonedirectory` WRITE;
+/*!40000 ALTER TABLE `phonedirectory` DISABLE KEYS */;
+INSERT INTO `phonedirectory` (`intid`, `nickname`, `firstname`, `surname`, `url`, `directory`, `photofile`, `speeddial`, `onhomelan`) VALUES (1,'Me(larch5)','Local Myth Host','larch5','','My MythTVs','',1,1);
+/*!40000 ALTER TABLE `phonedirectory` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `pidcache`
+--
+
+DROP TABLE IF EXISTS `pidcache`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `pidcache` (
+  `chanid` smallint(6) NOT NULL default '0',
+  `pid` int(11) NOT NULL default '-1',
+  `tableid` int(11) NOT NULL default '-1',
+  KEY `chanid` (`chanid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `pidcache`
+--
+
+LOCK TABLES `pidcache` WRITE;
+/*!40000 ALTER TABLE `pidcache` DISABLE KEYS */;
+/*!40000 ALTER TABLE `pidcache` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `playgroup`
+--
+
+DROP TABLE IF EXISTS `playgroup`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `playgroup` (
+  `name` varchar(32) NOT NULL default '',
+  `titlematch` varchar(255) NOT NULL default '',
+  `skipahead` int(11) NOT NULL default '0',
+  `skipback` int(11) NOT NULL default '0',
+  `timestretch` int(11) NOT NULL default '0',
+  `jump` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `playgroup`
+--
+
+LOCK TABLES `playgroup` WRITE;
+/*!40000 ALTER TABLE `playgroup` DISABLE KEYS */;
+INSERT INTO `playgroup` (`name`, `titlematch`, `skipahead`, `skipback`, `timestretch`, `jump`) VALUES ('Default','',30,5,100,0);
+/*!40000 ALTER TABLE `playgroup` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `powerpriority`
+--
+
+DROP TABLE IF EXISTS `powerpriority`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `powerpriority` (
+  `priorityname` varchar(64) NOT NULL,
+  `recpriority` int(10) NOT NULL default '0',
+  `selectclause` text NOT NULL,
+  PRIMARY KEY  (`priorityname`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `powerpriority`
+--
+
+LOCK TABLES `powerpriority` WRITE;
+/*!40000 ALTER TABLE `powerpriority` DISABLE KEYS */;
+/*!40000 ALTER TABLE `powerpriority` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `profilegroups`
+--
+
+DROP TABLE IF EXISTS `profilegroups`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `profilegroups` (
+  `id` int(10) unsigned NOT NULL auto_increment,
+  `name` varchar(128) default NULL,
+  `cardtype` varchar(32) NOT NULL default 'V4L',
+  `is_default` int(1) default '0',
+  `hostname` varchar(255) default NULL,
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `name` (`name`,`hostname`),
+  KEY `cardtype` (`cardtype`)
+) ENGINE=MyISAM AUTO_INCREMENT=13 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `profilegroups`
+--
+
+LOCK TABLES `profilegroups` WRITE;
+/*!40000 ALTER TABLE `profilegroups` DISABLE KEYS */;
+INSERT INTO `profilegroups` (`id`, `name`, `cardtype`, `is_default`, `hostname`) VALUES (1,'Software Encoders (v4l based)','V4L',1,NULL),(2,'MPEG-2 Encoders (PVR-x50, PVR-500)','MPEG',1,NULL),(3,'Hardware MJPEG Encoders (Matrox G200-TV, Miro DC10, etc)','MJPEG',1,NULL),(4,'Hardware HDTV','HDTV',1,NULL),(5,'Hardware DVB Encoders','DVB',1,NULL),(6,'Transcoders','TRANSCODE',1,NULL),(7,'FireWire Input','FIREWIRE',1,NULL),(8,'USB Mpeg-4 Encoder (Plextor ConvertX, etc)','GO7007',1,NULL),(9,'DBOX2 Input','DBOX2',1,NULL),(10,'Freebox Input','Freebox',1,NULL),(11,'HDHomeRun Recorders','HDHOMERUN',1,NULL),(12,'CRC IP Recorders','CRC_IP',1,NULL);
+/*!40000 ALTER TABLE `profilegroups` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `program`
+--
+
+DROP TABLE IF EXISTS `program`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `program` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `endtime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `title` varchar(128) NOT NULL default '',
+  `subtitle` varchar(128) NOT NULL default '',
+  `description` text NOT NULL,
+  `category` varchar(64) NOT NULL default '',
+  `category_type` varchar(64) NOT NULL default '',
+  `airdate` year(4) NOT NULL default '0000',
+  `stars` float NOT NULL default '0',
+  `previouslyshown` tinyint(4) NOT NULL default '0',
+  `title_pronounce` varchar(128) NOT NULL default '',
+  `stereo` tinyint(1) NOT NULL default '0',
+  `subtitled` tinyint(1) NOT NULL default '0',
+  `hdtv` tinyint(1) NOT NULL default '0',
+  `closecaptioned` tinyint(1) NOT NULL default '0',
+  `partnumber` int(11) NOT NULL default '0',
+  `parttotal` int(11) NOT NULL default '0',
+  `seriesid` varchar(40) NOT NULL default '',
+  `originalairdate` date default NULL,
+  `showtype` varchar(30) NOT NULL default '',
+  `colorcode` varchar(20) NOT NULL default '',
+  `syndicatedepisodenumber` varchar(20) NOT NULL default '',
+  `programid` varchar(40) NOT NULL default '',
+  `manualid` int(10) unsigned NOT NULL default '0',
+  `generic` tinyint(1) default '0',
+  `listingsource` int(11) NOT NULL default '0',
+  `first` tinyint(1) NOT NULL default '0',
+  `last` tinyint(1) NOT NULL default '0',
+  `audioprop` set('STEREO','MONO','SURROUND','DOLBY','HARDHEAR','VISUALIMPAIR') NOT NULL,
+  `subtitletypes` set('HARDHEAR','NORMAL','ONSCREEN','SIGNED') NOT NULL,
+  `videoprop` set('HDTV','WIDESCREEN','AVC') NOT NULL,
+  PRIMARY KEY  (`chanid`,`starttime`,`manualid`),
+  KEY `endtime` (`endtime`),
+  KEY `title` (`title`),
+  KEY `title_pronounce` (`title_pronounce`),
+  KEY `seriesid` (`seriesid`),
+  KEY `id_start_end` (`chanid`,`starttime`,`endtime`),
+  KEY `program_manualid` (`manualid`),
+  KEY `previouslyshown` (`previouslyshown`),
+  KEY `programid` (`programid`,`starttime`),
+  KEY `starttime` (`starttime`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `program`
+--
+
+LOCK TABLES `program` WRITE;
+/*!40000 ALTER TABLE `program` DISABLE KEYS */;
+/*!40000 ALTER TABLE `program` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `programgenres`
+--
+
+DROP TABLE IF EXISTS `programgenres`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `programgenres` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `relevance` char(1) NOT NULL default '',
+  `genre` char(30) default NULL,
+  PRIMARY KEY  (`chanid`,`starttime`,`relevance`),
+  KEY `genre` (`genre`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `programgenres`
+--
+
+LOCK TABLES `programgenres` WRITE;
+/*!40000 ALTER TABLE `programgenres` DISABLE KEYS */;
+/*!40000 ALTER TABLE `programgenres` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `programrating`
+--
+
+DROP TABLE IF EXISTS `programrating`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `programrating` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `system` char(8) NOT NULL default '',
+  `rating` char(16) default NULL,
+  UNIQUE KEY `chanid` (`chanid`,`starttime`,`system`,`rating`),
+  KEY `starttime` (`starttime`,`system`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `programrating`
+--
+
+LOCK TABLES `programrating` WRITE;
+/*!40000 ALTER TABLE `programrating` DISABLE KEYS */;
+/*!40000 ALTER TABLE `programrating` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `recgrouppassword`
+--
+
+DROP TABLE IF EXISTS `recgrouppassword`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `recgrouppassword` (
+  `recgroup` varchar(32) NOT NULL default '',
+  `password` varchar(10) NOT NULL default '',
+  PRIMARY KEY  (`recgroup`),
+  UNIQUE KEY `recgroup` (`recgroup`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `recgrouppassword`
+--
+
+LOCK TABLES `recgrouppassword` WRITE;
+/*!40000 ALTER TABLE `recgrouppassword` DISABLE KEYS */;
+/*!40000 ALTER TABLE `recgrouppassword` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `record`
+--
+
+DROP TABLE IF EXISTS `record`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `record` (
+  `recordid` int(10) unsigned NOT NULL auto_increment,
+  `type` int(10) unsigned NOT NULL default '0',
+  `chanid` int(10) unsigned default NULL,
+  `starttime` time NOT NULL default '00:00:00',
+  `startdate` date NOT NULL default '0000-00-00',
+  `endtime` time NOT NULL default '00:00:00',
+  `enddate` date NOT NULL default '0000-00-00',
+  `title` varchar(128) NOT NULL default '',
+  `subtitle` varchar(128) NOT NULL default '',
+  `description` text NOT NULL,
+  `category` varchar(64) NOT NULL default '',
+  `profile` varchar(128) NOT NULL default 'Default',
+  `recpriority` int(10) NOT NULL default '0',
+  `autoexpire` int(11) NOT NULL default '0',
+  `maxepisodes` int(11) NOT NULL default '0',
+  `maxnewest` int(11) NOT NULL default '0',
+  `startoffset` int(11) NOT NULL default '0',
+  `endoffset` int(11) NOT NULL default '0',
+  `recgroup` varchar(32) NOT NULL default 'Default',
+  `dupmethod` int(11) NOT NULL default '6',
+  `dupin` int(11) NOT NULL default '15',
+  `station` varchar(20) NOT NULL default '',
+  `seriesid` varchar(40) NOT NULL default '',
+  `programid` varchar(40) NOT NULL default '',
+  `search` int(10) unsigned NOT NULL default '0',
+  `autotranscode` tinyint(1) NOT NULL default '0',
+  `autocommflag` tinyint(1) NOT NULL default '0',
+  `autouserjob1` tinyint(1) NOT NULL default '0',
+  `autouserjob2` tinyint(1) NOT NULL default '0',
+  `autouserjob3` tinyint(1) NOT NULL default '0',
+  `autouserjob4` tinyint(1) NOT NULL default '0',
+  `findday` tinyint(4) NOT NULL default '0',
+  `findtime` time NOT NULL default '00:00:00',
+  `findid` int(11) NOT NULL default '0',
+  `inactive` tinyint(1) NOT NULL default '0',
+  `parentid` int(11) NOT NULL default '0',
+  `transcoder` int(11) NOT NULL default '0',
+  `tsdefault` float NOT NULL default '1',
+  `playgroup` varchar(32) NOT NULL default 'Default',
+  `prefinput` int(10) NOT NULL default '0',
+  `next_record` datetime NOT NULL,
+  `last_record` datetime NOT NULL,
+  `last_delete` datetime NOT NULL,
+  `storagegroup` varchar(32) NOT NULL default 'Default',
+  `avg_delay` int(11) NOT NULL default '100',
+  PRIMARY KEY  (`recordid`),
+  KEY `chanid` (`chanid`,`starttime`),
+  KEY `title` (`title`),
+  KEY `seriesid` (`seriesid`),
+  KEY `programid` (`programid`),
+  KEY `maxepisodes` (`maxepisodes`),
+  KEY `search` (`search`),
+  KEY `type` (`type`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `record`
+--
+
+LOCK TABLES `record` WRITE;
+/*!40000 ALTER TABLE `record` DISABLE KEYS */;
+/*!40000 ALTER TABLE `record` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `recorded`
+--
+
+DROP TABLE IF EXISTS `recorded`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `recorded` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `endtime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `title` varchar(128) NOT NULL default '',
+  `subtitle` varchar(128) NOT NULL default '',
+  `description` text NOT NULL,
+  `category` varchar(64) NOT NULL default '',
+  `hostname` varchar(255) NOT NULL default '',
+  `bookmark` tinyint(1) NOT NULL default '0',
+  `editing` int(10) unsigned NOT NULL default '0',
+  `cutlist` tinyint(1) NOT NULL default '0',
+  `autoexpire` int(11) NOT NULL default '0',
+  `commflagged` int(10) unsigned NOT NULL default '0',
+  `recgroup` varchar(32) NOT NULL default 'Default',
+  `recordid` int(11) default NULL,
+  `seriesid` varchar(40) NOT NULL default '',
+  `programid` varchar(40) NOT NULL default '',
+  `lastmodified` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
+  `filesize` bigint(20) NOT NULL default '0',
+  `stars` float NOT NULL default '0',
+  `previouslyshown` tinyint(1) default '0',
+  `originalairdate` date default NULL,
+  `preserve` tinyint(1) NOT NULL default '0',
+  `findid` int(11) NOT NULL default '0',
+  `deletepending` tinyint(1) NOT NULL default '0',
+  `transcoder` int(11) NOT NULL default '0',
+  `timestretch` float NOT NULL default '1',
+  `recpriority` int(11) NOT NULL default '0',
+  `basename` varchar(255) NOT NULL,
+  `progstart` datetime NOT NULL default '0000-00-00 00:00:00',
+  `progend` datetime NOT NULL default '0000-00-00 00:00:00',
+  `playgroup` varchar(32) NOT NULL default 'Default',
+  `profile` varchar(32) NOT NULL default '',
+  `duplicate` tinyint(1) NOT NULL default '0',
+  `transcoded` tinyint(1) NOT NULL default '0',
+  `watched` tinyint(4) NOT NULL default '0',
+  `storagegroup` varchar(32) NOT NULL default 'Default',
+  PRIMARY KEY  (`chanid`,`starttime`),
+  KEY `endtime` (`endtime`),
+  KEY `seriesid` (`seriesid`),
+  KEY `programid` (`programid`),
+  KEY `title` (`title`),
+  KEY `recordid` (`recordid`),
+  KEY `deletepending` (`deletepending`,`lastmodified`),
+  KEY `recgroup` (`recgroup`,`endtime`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `recorded`
+--
+
+LOCK TABLES `recorded` WRITE;
+/*!40000 ALTER TABLE `recorded` DISABLE KEYS */;
+/*!40000 ALTER TABLE `recorded` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `recordedcredits`
+--
+
+DROP TABLE IF EXISTS `recordedcredits`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `recordedcredits` (
+  `person` mediumint(8) unsigned NOT NULL default '0',
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `role` set('actor','director','producer','executive_producer','writer','guest_star','host','adapter','presenter','commentator','guest') NOT NULL default '',
+  UNIQUE KEY `chanid` (`chanid`,`starttime`,`person`,`role`),
+  KEY `person` (`person`,`role`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `recordedcredits`
+--
+
+LOCK TABLES `recordedcredits` WRITE;
+/*!40000 ALTER TABLE `recordedcredits` DISABLE KEYS */;
+/*!40000 ALTER TABLE `recordedcredits` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `recordedfile`
+--
+
+DROP TABLE IF EXISTS `recordedfile`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `recordedfile` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `basename` varchar(128) NOT NULL default '',
+  `filesize` bigint(20) NOT NULL default '0',
+  `width` smallint(5) unsigned NOT NULL default '0',
+  `height` smallint(5) unsigned NOT NULL default '0',
+  `fps` float(6,3) NOT NULL default '0.000',
+  `aspect` float(8,6) NOT NULL default '0.000000',
+  `audio_sample_rate` smallint(5) unsigned NOT NULL default '0',
+  `audio_bits_per_sample` smallint(5) unsigned NOT NULL default '0',
+  `audio_channels` tinyint(3) unsigned NOT NULL default '0',
+  `audio_type` varchar(255) NOT NULL default '',
+  `video_type` varchar(255) NOT NULL default '',
+  `comment` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`chanid`,`starttime`),
+  KEY `basename` (`basename`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `recordedfile`
+--
+
+LOCK TABLES `recordedfile` WRITE;
+/*!40000 ALTER TABLE `recordedfile` DISABLE KEYS */;
+/*!40000 ALTER TABLE `recordedfile` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `recordedmarkup`
+--
+
+DROP TABLE IF EXISTS `recordedmarkup`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `recordedmarkup` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `mark` mediumint(8) unsigned NOT NULL default '0',
+  `offset` varchar(32) default NULL,
+  `type` tinyint(4) NOT NULL default '0',
+  PRIMARY KEY  (`chanid`,`starttime`,`type`,`mark`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `recordedmarkup`
+--
+
+LOCK TABLES `recordedmarkup` WRITE;
+/*!40000 ALTER TABLE `recordedmarkup` DISABLE KEYS */;
+/*!40000 ALTER TABLE `recordedmarkup` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `recordedprogram`
+--
+
+DROP TABLE IF EXISTS `recordedprogram`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `recordedprogram` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `endtime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `title` varchar(128) NOT NULL default '',
+  `subtitle` varchar(128) NOT NULL default '',
+  `description` text NOT NULL,
+  `category` varchar(64) NOT NULL default '',
+  `category_type` varchar(64) NOT NULL default '',
+  `airdate` year(4) NOT NULL default '0000',
+  `stars` float unsigned NOT NULL default '0',
+  `previouslyshown` tinyint(4) NOT NULL default '0',
+  `title_pronounce` varchar(128) NOT NULL default '',
+  `stereo` tinyint(1) NOT NULL default '0',
+  `subtitled` tinyint(1) NOT NULL default '0',
+  `hdtv` tinyint(1) NOT NULL default '0',
+  `closecaptioned` tinyint(1) NOT NULL default '0',
+  `partnumber` int(11) NOT NULL default '0',
+  `parttotal` int(11) NOT NULL default '0',
+  `seriesid` varchar(40) NOT NULL default '',
+  `originalairdate` date default NULL,
+  `showtype` varchar(30) NOT NULL default '',
+  `colorcode` varchar(20) NOT NULL default '',
+  `syndicatedepisodenumber` varchar(20) NOT NULL default '',
+  `programid` varchar(40) NOT NULL default '',
+  `manualid` int(10) unsigned NOT NULL default '0',
+  `generic` tinyint(1) default '0',
+  `listingsource` int(11) NOT NULL default '0',
+  `first` tinyint(1) NOT NULL default '0',
+  `last` tinyint(1) NOT NULL default '0',
+  `audioprop` set('STEREO','MONO','SURROUND','DOLBY','HARDHEAR','VISUALIMPAIR') NOT NULL,
+  `subtitletypes` set('HARDHEAR','NORMAL','ONSCREEN','SIGNED') NOT NULL,
+  `videoprop` set('HDTV','WIDESCREEN','AVC') NOT NULL,
+  PRIMARY KEY  (`chanid`,`starttime`,`manualid`),
+  KEY `endtime` (`endtime`),
+  KEY `title` (`title`),
+  KEY `title_pronounce` (`title_pronounce`),
+  KEY `seriesid` (`seriesid`),
+  KEY `programid` (`programid`),
+  KEY `id_start_end` (`chanid`,`starttime`,`endtime`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `recordedprogram`
+--
+
+LOCK TABLES `recordedprogram` WRITE;
+/*!40000 ALTER TABLE `recordedprogram` DISABLE KEYS */;
+/*!40000 ALTER TABLE `recordedprogram` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `recordedrating`
+--
+
+DROP TABLE IF EXISTS `recordedrating`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `recordedrating` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `system` char(8) NOT NULL default '',
+  `rating` char(16) default NULL,
+  UNIQUE KEY `chanid` (`chanid`,`starttime`,`system`,`rating`),
+  KEY `starttime` (`starttime`,`system`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `recordedrating`
+--
+
+LOCK TABLES `recordedrating` WRITE;
+/*!40000 ALTER TABLE `recordedrating` DISABLE KEYS */;
+/*!40000 ALTER TABLE `recordedrating` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `recordedseek`
+--
+
+DROP TABLE IF EXISTS `recordedseek`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `recordedseek` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `mark` mediumint(8) unsigned NOT NULL default '0',
+  `offset` bigint(20) unsigned NOT NULL,
+  `type` tinyint(4) NOT NULL default '0',
+  PRIMARY KEY  (`chanid`,`starttime`,`type`,`mark`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `recordedseek`
+--
+
+LOCK TABLES `recordedseek` WRITE;
+/*!40000 ALTER TABLE `recordedseek` DISABLE KEYS */;
+/*!40000 ALTER TABLE `recordedseek` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `recordingprofiles`
+--
+
+DROP TABLE IF EXISTS `recordingprofiles`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `recordingprofiles` (
+  `id` int(10) unsigned NOT NULL auto_increment,
+  `name` varchar(128) default NULL,
+  `videocodec` varchar(128) default NULL,
+  `audiocodec` varchar(128) default NULL,
+  `profilegroup` int(10) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`id`),
+  KEY `profilegroup` (`profilegroup`)
+) ENGINE=MyISAM AUTO_INCREMENT=50 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `recordingprofiles`
+--
+
+LOCK TABLES `recordingprofiles` WRITE;
+/*!40000 ALTER TABLE `recordingprofiles` DISABLE KEYS */;
+INSERT INTO `recordingprofiles` (`id`, `name`, `videocodec`, `audiocodec`, `profilegroup`) VALUES (1,'Default',NULL,NULL,1),(2,'Live TV',NULL,NULL,1),(3,'High Quality',NULL,NULL,1),(4,'Low Quality',NULL,NULL,1),(5,'Default',NULL,NULL,2),(6,'Live TV',NULL,NULL,2),(7,'High Quality',NULL,NULL,2),(8,'Low Quality',NULL,NULL,2),(9,'Default',NULL,NULL,3),(10,'Live TV',NULL,NULL,3),(11,'High Quality',NULL,NULL,3),(12,'Low Quality',NULL,NULL,3),(13,'Default',NULL,NULL,4),(14,'Live TV',NULL,NULL,4),(15,'High Quality',NULL,NULL,4),(16,'Low Quality',NULL,NULL,4),(17,'Default',NULL,NULL,5),(18,'Live TV',NULL,NULL,5),(19,'High Quality',NULL,NULL,5),(20,'Low Quality',NULL,NULL,5),(21,'RTjpeg/MPEG4',NULL,NULL,6),(22,'MPEG2',NULL,NULL,6),(23,'Default',NULL,NULL,8),(24,'Live TV',NULL,NULL,8),(25,'High Quality',NULL,NULL,8),(26,'Low Quality',NULL,NULL,8),(27,'High Quality',NULL,NULL,6),(28,'Medium Quality',NULL,NULL,6),(29,'Low Quality',NULL,NULL,6),(30,'Default',NULL,NULL,10),(31,'Live TV',NULL,NULL,10),(32,'High Quality',NULL,NULL,10),(33,'Low Quality',NULL,NULL,10),(34,'Default',NULL,NULL,11),(35,'Live TV',NULL,NULL,11),(36,'High Quality',NULL,NULL,11),(37,'Low Quality',NULL,NULL,11),(38,'Default',NULL,NULL,12),(39,'Live TV',NULL,NULL,12),(40,'High Quality',NULL,NULL,12),(41,'Low Quality',NULL,NULL,12),(42,'Default',NULL,NULL,7),(43,'Live TV',NULL,NULL,7),(44,'High Quality',NULL,NULL,7),(45,'Low Quality',NULL,NULL,7),(46,'Default',NULL,NULL,9),(47,'Live TV',NULL,NULL,9),(48,'High Quality',NULL,NULL,9),(49,'Low Quality',NULL,NULL,9);
+/*!40000 ALTER TABLE `recordingprofiles` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `recordmatch`
+--
+
+DROP TABLE IF EXISTS `recordmatch`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `recordmatch` (
+  `recordid` int(10) unsigned default NULL,
+  `chanid` int(10) unsigned default NULL,
+  `starttime` datetime default NULL,
+  `manualid` int(10) unsigned default NULL,
+  `oldrecduplicate` tinyint(1) default NULL,
+  `recduplicate` tinyint(1) default NULL,
+  `findduplicate` tinyint(1) default NULL,
+  `oldrecstatus` int(11) default NULL,
+  KEY `recordid` (`recordid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `recordmatch`
+--
+
+LOCK TABLES `recordmatch` WRITE;
+/*!40000 ALTER TABLE `recordmatch` DISABLE KEYS */;
+/*!40000 ALTER TABLE `recordmatch` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `romdb`
+--
+
+DROP TABLE IF EXISTS `romdb`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `romdb` (
+  `crc` varchar(64) NOT NULL default '',
+  `name` varchar(128) NOT NULL default '',
+  `description` varchar(128) NOT NULL default '',
+  `category` varchar(128) NOT NULL default '',
+  `year` varchar(10) NOT NULL default '',
+  `manufacturer` varchar(128) NOT NULL default '',
+  `country` varchar(128) NOT NULL default '',
+  `publisher` varchar(128) NOT NULL default '',
+  `platform` varchar(64) NOT NULL default '',
+  `filesize` int(12) default NULL,
+  `flags` varchar(64) NOT NULL default '',
+  `version` varchar(64) NOT NULL default '',
+  `binfile` varchar(64) NOT NULL default '',
+  KEY `crc` (`crc`),
+  KEY `year` (`year`),
+  KEY `category` (`category`),
+  KEY `name` (`name`),
+  KEY `description` (`description`),
+  KEY `platform` (`platform`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `romdb`
+--
+
+LOCK TABLES `romdb` WRITE;
+/*!40000 ALTER TABLE `romdb` DISABLE KEYS */;
+/*!40000 ALTER TABLE `romdb` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `schemalock`
+--
+
+DROP TABLE IF EXISTS `schemalock`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `schemalock` (
+  `schemalock` int(1) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `schemalock`
+--
+
+LOCK TABLES `schemalock` WRITE;
+/*!40000 ALTER TABLE `schemalock` DISABLE KEYS */;
+/*!40000 ALTER TABLE `schemalock` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `settings`
+--
+
+DROP TABLE IF EXISTS `settings`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `settings` (
+  `value` varchar(128) NOT NULL default '',
+  `data` text,
+  `hostname` varchar(255) default NULL,
+  KEY `value` (`value`,`hostname`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `settings`
+--
+
+LOCK TABLES `settings` WRITE;
+/*!40000 ALTER TABLE `settings` DISABLE KEYS */;
+INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES ('mythfilldatabaseLastRunStart',NULL,NULL),('mythfilldatabaseLastRunEnd',NULL,NULL),('mythfilldatabaseLastRunStatus',NULL,NULL),('DataDirectMessage',NULL,NULL),('HaveRepeats','0',NULL),('DBSchemaVer','1214',NULL),('DefaultTranscoder','0',NULL),('MythFillSuggestedRunTime','1970-01-01T00:00:00',NULL),('MythFillGrabberSuggestsTime','1',NULL),('MythFillFixProgramIDsHasRunOnce','1','larch5'),('Language','EN','larch5'),('BackendServerIP','127.0.0.1','larch5'),('BackendServerPort','6543','larch5'),('BackendStatusPort','6544','larch5'),('SecurityPin','','larch5'),('MasterServerIP','127.0.0.1',NULL),('MasterServerPort','6543',NULL),('TVFormat','NTSC',NULL),('VbiFormat','None',NULL),('FreqTable','us-bcast',NULL),('TimeOffset','None',NULL),('MasterBackendOverride','1',NULL),('DeletesFollowLinks','1',NULL),('TruncateDeletesSlowly','0','larch5'),('HDRingbufferSize','9400',NULL),('MiscStatusScript','','larch5'),('DisableFirewireReset','0','larch5'),('EITTransportTimeout','5',NULL),('EITIgnoresSource','0',NULL),('EITCrawIdleStart','60',NULL),('startupCommand','',NULL),('blockSDWUwithoutClient','1',NULL),('idleWaitForRecordingTime','15',NULL),('StartupSecsBeforeRecording','120',NULL),('WakeupTimeFormat','hh:mm yyyy-MM-dd',NULL),('SetWakeuptimeCommand','',NULL),('ServerHaltCommand','sudo /sbin/halt -p',NULL),('preSDWUCheckCommand','',NULL),('WOLbackendConnectRetry','5',NULL),('WOLbackendCommand','',NULL),('WOLslaveBackendsCommand','',NULL),('JobQueueMaxSimultaneousJobs','1','larch5'),('JobQueueCheckFrequency','60','larch5'),('JobQueueWindowStart','00:00','larch5'),('JobQueueWindowEnd','23:59','larch5'),('JobQueueCPU','0','larch5'),('JobAllowCommFlag','1','larch5'),('JobAllowTranscode','1','larch5'),('JobAllowUserJob1','0','larch5'),('JobAllowUserJob2','0','larch5'),('JobAllowUserJob3','0','larch5'),('JobAllowUserJob4','0','larch5'),('JobsRunOnRecordHost','0',NULL),('AutoCommflagWhileRecording','0',NULL),('JobQueueCommFlagCommand','mythcommflag',NULL),('JobQueueTranscodeCommand','mythtranscode',NULL),('AutoTranscodeBeforeAutoCommflag','0',NULL),('SaveTranscoding','0',NULL),('UserJobDesc1','User Job #1',NULL),('UserJob1','',NULL),('UserJobDesc2','User Job #2',NULL),('UserJob2','',NULL),('UserJobDesc3','User Job #3',NULL),('UserJob3','',NULL),('UserJobDesc4','User Job #4',NULL),('UserJob4','',NULL),('DefaultVideoPlaybackProfile','CPU+','larch5'),('RealtimePriority','1','larch5'),('DecodeExtraAudio','1','larch5'),('AudioNag','1','larch5'),('UseVideoTimebase','0','larch5'),('ClearSavedPosition','1','larch5'),('AltClearSavedPosition','1','larch5'),('JumpToProgramOSD','1','larch5'),('ContinueEmbeddedTVPlay','0','larch5'),('AutomaticSetWatched','0','larch5'),('AlwaysStreamFiles','1','larch5'),('UseOpenGLVSync','0','larch5'),('UseOutputPictureControls','1','larch5'),('AspectOverride','0','larch5'),('AdjustFill','0','larch5'),('LetterboxColour','0','larch5'),('PIPLocation','0','larch5'),('PlaybackExitPrompt','2','larch5'),('EndOfRecordingExitPrompt','1','larch5'),('PlayBoxOrdering','1','larch5'),('PlayBoxEpisodeSort','Date','larch5'),('GeneratePreviewPixmaps','0','larch5'),('PreviewPixmapOffset','64',NULL),('PreviewFromBookmark','1','larch5'),('PlaybackPreview','1','larch5'),('PlaybackBoxStartInTitle','1','larch5'),('ShowGroupInfo','0','larch5'),('AllRecGroupPassword','',NULL),('DisplayRecGroup','All Programs','larch5'),('QueryInitialFilter','0','larch5'),('RememberRecGroup','1','larch5'),('DispRecGroupAsAllProg','0','larch5'),('LiveTVInAllPrograms','0','larch5'),('DisplayGroupDefaultView','0','larch5'),('DisplayGroupTitleSort','0','larch5'),('PlaybackWatchList','1','larch5'),('PlaybackWLStart','0','larch5'),('PlaybackWLAutoExpire','0','larch5'),('PlaybackWLMaxAge','60','larch5'),('PlaybackWLBlackOut','2','larch5'),('SmartForward','0','larch5'),('StickyKeys','0','larch5'),('FFRewReposTime','100','larch5'),('FFRewReverse','1','larch5'),('ExactSeeking','0','larch5'),('AutoCommercialSkip','0','larch5'),('MaximumCommercialSkip','3600',NULL),('CommSkipAllBlanks','1',NULL),('PVR350OutputEnable','0','larch5'),('PVR350EPGAlphaValue','164','larch5'),('PVR350InternalAudioOnly','0','larch5'),('OSDTheme','blueosd','larch5'),('OSDGeneralTimeout','2','larch5'),('OSDProgramInfoTimeout','3','larch5'),('OSDFont','FreeMono.ttf','larch5'),('OSDThemeFontSizeType','default','larch5'),('EnableMHEG','0','larch5'),('PersistentBrowseMode','1','larch5'),('OSDNotifyTimeout','5','larch5'),('UDPNotifyPort','6948','larch5'),('OSDCCFont','FreeMono.ttf','larch5'),('CCBackground','0','larch5'),('DefaultCCMode','0','larch5'),('Prefer708Captions','1','larch5'),('OSDCC708TextZoom','100','larch5'),('[REDACTED]','MonoSerif','larch5'),('OSDCC708MonoSerifFont','FreeMono.ttf','larch5'),('OSDCC708PropSerifFont','FreeMono.ttf','larch5'),('OSDCC708MonoSansSerifFont','FreeMono.ttf','larch5'),('OSDCC708PropSansSerifFont','FreeMono.ttf','larch5'),('OSDCC708CasualFont','FreeMono.ttf','larch5'),('OSDCC708CursiveFont','FreeMono.ttf','larch5'),('OSDCC708CapitalsFont','FreeMono.ttf','larch5'),('OSDCC708MonoSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708PropSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708MonoSansSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708PropSansSerifItalicFont','FreeMono.ttf','larch5'),('OSDCC708CasualItalicFont','FreeMono.ttf','larch5'),('OSDCC708CursiveItalicFont','FreeMono.ttf','larch5'),('OSDCC708CapitalsItalicFont','FreeMono.ttf','larch5'),('ChannelOrdering','channum','larch5'),('ChannelFormat','<num> <sign>','larch5'),('LongChannelFormat','<num> <name>','larch5'),('SmartChannelChange','0','larch5'),('LastFreeCard','0',NULL),('LiveTVPriority','0',NULL),('AutoExpireMethod','2',NULL),('AutoExpireDefault','1',NULL),('RerecordWatched','1',NULL),('AutoExpireWatchedPriority','0',NULL),('AutoExpireLiveTVMaxAge','1',NULL),('AutoExpireDayPriority','3',NULL),('AutoExpireExtraSpace','1',NULL),('AutoExpireInsteadOfDelete','0',NULL),('DeletedFifoOrder','0',NULL),('CommercialSkipMethod','255',NULL),('AggressiveCommDetect','1',NULL),('AutoCommercialFlag','1',NULL),('AutoTranscode','0',NULL),('AutoRunUserJob1','0',NULL),('AutoRunUserJob2','0',NULL),('AutoRunUserJob3','0',NULL),('AutoRunUserJob4','0',NULL),('OverTimeCategory','category name',NULL),('CategoryOverTime','30',NULL),('EPGFillType','12','larch5'),('EPGShowCategoryColors','1','larch5'),('EPGShowCategoryText','1','larch5'),('EPGScrollType','1','larch5'),('EPGShowChannelIcon','1','larch5'),('EPGShowFavorites','0','larch5'),('WatchTVGuide','0','larch5'),('chanPerPage','5','larch5'),('timePerPage','4','larch5'),('UnknownTitle','Unknown','larch5'),('UnknownCategory','Unknown','larch5'),('DefaultTVChannel','3','larch5'),('SelectChangesChannel','0','larch5'),('SelChangeRecThreshold','16','larch5'),('EPGEnableJumpToChannel','0',NULL),('Theme','LinHES','larch5'),('RandomTheme','0','larch5'),('ThemeCacheSize','1','larch5'),('ThemePainter','qt','larch5'),('Style','Desktop Style','larch5'),('ThemeFontSizeType','default','larch5'),('MenuTheme','default','larch5'),('XineramaScreen','0','larch5'),('XineramaMonitorAspectRatio','1.3333','larch5'),('GuiSizeForTV','1','larch5'),('HideMouseCursor','1','larch5'),('RunFrontendInWindow','0','larch5'),('UseVideoModes','0','larch5'),('GuiVidModeResolution','640x480','larch5'),('TVVidModeResolution','320x200','larch5'),('TVVidModeForceAspect','0.0','larch5'),('TVVidModeResolution0','320x200','larch5'),('TVVidModeForceAspect0','0.0','larch5'),('TVVidModeResolution1','320x200','larch5'),('TVVidModeForceAspect1','0.0','larch5'),('TVVidModeResolution2','320x200','larch5'),('TVVidModeForceAspect2','0.0','larch5'),('ISO639Language0','eng','larch5'),('ISO639Language1','eng','larch5'),('DateFormat','ddd MMM d','larch5'),('ShortDateFormat','M/d','larch5'),('TimeFormat','h:mm AP','larch5'),('QtFontSmall','12','larch5'),('QtFontMedium','16','larch5'),('QtFontBig','25','larch5'),('PlayBoxTransparency','1','larch5'),('PlayBoxShading','0','larch5'),('UseVirtualKeyboard','1','larch5'),('LCDEnable','0','larch5'),('LCDShowTime','1','larch5'),('LCDShowMenu','1','larch5'),('LCDShowMusic','1','larch5'),('LCDShowMusicItems','ArtistTitle','larch5'),('LCDShowChannel','1','larch5'),('LCDShowRecStatus','0','larch5'),('LCDShowVolume','1','larch5'),('LCDShowGeneric','1','larch5'),('LCDBacklightOn','1','larch5'),('LCDHeartBeatOn','0','larch5'),('LCDBigClock','0','larch5'),('LCDKeyString','ABCDEF','larch5'),('LCDPopupTime','5','larch5'),('AudioOutputDevice','ALSA:default','larch5'),('PassThruOutputDevice','Default','larch5'),('MaxChannels','2','larch5'),('AudioUpmixType','0','larch5'),('AC3PassThru','0','larch5'),('DTSPassThru','0','larch5'),('AggressiveSoundcardBuffer','0','larch5'),('MythControlsVolume','1','larch5'),('MixerDevice','ALSA:default','larch5'),('MixerControl','PCM','larch5'),('MasterMixerVolume','100','larch5'),('PCMMixerVolume','50','larch5'),('IndividualMuteControl','0','larch5'),('LircKeyPressedApp','','larch5'),('AllowQuitShutdown','4','larch5'),('NoPromptOnExit','1','larch5'),('UseArrowAccels','1','larch5'),('NetworkControlEnabled','0','larch5'),('NetworkControlPort','6546','larch5'),('MonitorDrives','0','larch5'),('MediaChangeEvents','0','larch5'),('IgnoreDevices','','larch5'),('SetupPinCodeRequired','0','larch5'),('OverrideExitMenu','0','larch5'),('HaltCommand','sudo /sbin/halt','larch5'),('RebootCommand','sudo /sbin/reboot','larch5'),('EnableXbox','0','larch5'),('LogEnabled','0',NULL),('LogMaxCount','100','larch5'),('LogPrintLevel','8','larch5'),('LogCleanEnabled','0','larch5'),('LogCleanPeriod','14','larch5'),('LogCleanDays','14','larch5'),('LogCleanMax','30','larch5'),('MythFillEnabled','1',NULL),('MythFillDatabasePath','mythfilldatabase',NULL),('MythFillDatabaseArgs','',NULL),('MythFillDatabaseLog','',NULL),('MythFillPeriod','1',NULL),('MythFillMinHour','2',NULL),('MythFillMaxHour','5',NULL),('SchedMoveHigher','1',NULL),('SchedOpenEnd','0',NULL),('ComplexPriority','0',NULL),('PrefInputPriority','2',NULL),('SingleRecordRecPriority','1',NULL),('FindOneRecordRecPriority','-1',NULL),('ArchiveDBSchemaVer','1001',NULL),('MythArchiveTempDir','/myth/tmp','larch5'),('MythArchiveShareDir','/usr/share/mythtv/mytharchive/','larch5'),('MythArchiveVideoFormat','NTSC','larch5'),('MythArchiveFileFilter','*.mpg *.mov *.avi *.mpeg *.nuv','larch5'),('MythArchiveDVDLocation','/dev/dvd','larch5'),('MythArchiveDVDPlayerCmd','Internal','larch5'),('MythArchiveEncodeToAc3','0','larch5'),('MythArchiveCopyRemoteFiles','0','larch5'),('MythArchiveAlwaysUseMythTranscode','1','larch5'),('MythArchiveUseProjectX','0','larch5'),('MythArchiveAddSubtitles','0','larch5'),('MythArchiveUseFIFO','1','larch5'),('MythArchiveDefaultEncProfile','SP','larch5'),('MythArchiveMainMenuAR','16:9','larch5'),('MythArchiveChapterMenuAR','Video','larch5'),('MythArchiveDateFormat','%a  %b  %d','larch5'),('MythArchiveTimeFormat','%I:%M %p','larch5'),('MythArchiveFfmpegCmd','ffmpeg','larch5'),('MythArchiveMplexCmd','mplex','larch5'),('MythArchiveDvdauthorCmd','dvdauthor','larch5'),('MythArchiveSpumuxCmd','spumux','larch5'),('MythArchiveMpeg2encCmd','mpeg2enc','larch5'),('MythArchiveMkisofsCmd','mkisofs','larch5'),('MythArchiveGrowisofsCmd','growisofs','larch5'),('MythArchiveTcrequantCmd','tcrequant','larch5'),('MythArchiveJpeg2yuvCmd','jpeg2yuv','larch5'),('MythArchiveProjectXCmd','projectx','larch5'),('FlixDBSchemaVer','1001',NULL),('GalleryDBSchemaVer','1000',NULL),('GalleryDir','/myth/gallery','larch5'),('GalleryThumbnailLocation','1','larch5'),('GallerySortOrder','20','larch5'),('GalleryImportDirs','/mnt/cdrom:/mnt/camera','larch5'),('GalleryMoviePlayerCmd','mplayer -fs %s','larch5'),('SlideshowUseOpenGL','0','larch5'),('SlideshowDelay','5','larch5'),('SlideshowOpenGLTransition','none','larch5'),('SlideshowOpenGLTransitionLength','2000','larch5'),('SlideshowTransition','random','larch5'),('SlideshowBackground','black','larch5'),('GameDBSchemaVer','1012',NULL),('MusicDBSchemaVer','1013',NULL),('VisualMode','','larch5'),('MusicLocation','/myth/music/','larch5'),('MusicAudioDevice','default','larch5'),('CDDevice','/dev/cdrom','larch5'),('AutoLookupCD','1','larch5'),('AutoPlayCD','0','larch5'),('KeyboardAccelerators','1','larch5'),('TreeLevels','splitartist artist album title','larch5'),('ArtistTreeGroups','0','larch5'),('NonID3FileNameFormat','GENRE/ARTIST/ALBUM/TRACK_TITLE','larch5'),('Ignore_ID3','0','larch5'),('MusicTagEncoding','utf16','larch5'),('CDWriterEnabled','1','larch5'),('CDDiskSize','1','larch5'),('CDCreateDir','1','larch5'),('CDWriteSpeed','0','larch5'),('CDBlankType','fast','larch5'),('PlayMode','none','larch5'),('ResumeMode','off','larch5'),('MaxSearchResults','300','larch5'),('MusicShowRatings','0','larch5'),('ShowWholeTree','0','larch5'),('ListAsShuffled','0','larch5'),('IntelliRatingWeight','35','larch5'),('IntelliPlayCountWeight','25','larch5'),('IntelliLastPlayWeight','25','larch5'),('IntelliRandomWeight','15','larch5'),('VisualCycleOnSongChange','0','larch5'),('VisualAlbumArtOnSongChange','0','larch5'),('VisualRandomize','0','larch5'),('VisualModeDelay','0','larch5'),('VisualScaleWidth','1','larch5'),('VisualScaleHeight','1','larch5'),('ParanoiaLevel','Full','larch5'),('FilenameTemplate','ARTIST/ALBUM/TRACK-TITLE','larch5'),('NoWhitespace','0','larch5'),('PostCDRipScript','','larch5'),('EjectCDAfterRipping','1','larch5'),('EncoderType','ogg','larch5'),('DefaultRipQuality','1','larch5'),('Mp3UseVBR','0','larch5'),('PhoneDBSchemaVer','1001',NULL),('SipRegisterWithProxy','1','larch5'),('SipProxyName','fwd.pulver.com','larch5'),('SipProxyAuthName','','larch5'),('SipProxyAuthPassword','','larch5'),('MySipName','Me','larch5'),('SipAutoanswer','0','larch5'),('SipBindInterface','eth0','larch5'),('SipLocalPort','5060','larch5'),('NatTraversalMethod','None','larch5'),('NatIpAddress','http://checkip.dyndns.org','larch5'),('AudioLocalPort','21232','larch5'),('VideoLocalPort','21234','larch5'),('MicrophoneDevice','None','larch5'),('CodecPriorityList','GSM;G.711u;G.711a','larch5'),('PlayoutAudioCall','40','larch5'),('PlayoutVideoCall','110','larch5'),('TxResolution','176x144','larch5'),('TransmitFPS','5','larch5'),('TransmitBandwidth','256','larch5'),('CaptureResolution','352x288','larch5'),('TimeToAnswer','10','larch5'),('DefaultVxmlUrl','http://127.0.0.1/vxml/index.vxml','larch5'),('DefaultVoicemailPrompt','I am not at home, please leave a message after the tone','larch5'),('mythvideo.DBSchemaVer','1016',NULL),('VideoStartupDir','/myth/video','larch5'),('VideoArtworkDir','/myth/video/.covers','larch5'),('Default MythVideo View','2','larch5'),('VideoListUnknownFiletypes','1','larch5'),('VideoBrowserNoDB','1','larch5'),('VideoGalleryNoDB','1','larch5'),('VideoTreeNoDB','1','larch5'),('VideoTreeLoadMetaData','1','larch5'),('VideoNewBrowsable','1','larch5'),('mythvideo.sort_ignores_case','1','larch5'),('mythvideo.db_folder_view','1','larch5'),('mythvideo.VideoTreeRemember','1','larch5'),('mythvideo.ImageCacheSize','50','larch5'),('DVDDeviceLocation','/dev/dvd','larch5'),('VCDDeviceLocation','/dev/cdrom','larch5'),('DVDOnInsertDVD','1','larch5'),('DVDDriveSpeed','2','larch5'),('EnableDVDBookmark','1','larch5'),('DVDBookmarkPrompt','1','larch5'),('DVDBookmarkDays','10','larch5'),('MovieListCommandLine','/usr/share/mythtv/mythvideo/scripts/imdb.pl -M tv=no;video=no','larch5'),('MoviePosterCommandLine','/usr/share/mythtv/mythvideo/scripts/imdb.pl -P','larch5'),('MovieDataCommandLine','/usr/share/mythtv/mythvideo/scripts/imdb.pl -D','larch5'),('VideoGalleryColsPerPage','4','larch5'),('VideoGalleryRowsPerPage','3','larch5'),('VideoGallerySubtitle','1','larch5'),('VideoDefaultParentalLevel','4','larch5'),('VideoAggressivePC','0','larch5'),('mythvideo.ParentalLevelFromRating','0','larch5'),('mythvideo.AutoR2PL1','G','larch5'),('mythvideo.AutoR2PL2','PG','larch5'),('mythvideo.AutoR2PL3','PG-13','larch5'),('mythvideo.AutoR2PL4','R:NC-17','larch5'),('VideoDefaultPlayer','mplayer -fs -zoom -quiet -vo xv %s','larch5'),('mythdvd.DVDPlayerCommand','Internal','larch5'),('VCDPlayerCommand','mplayer vcd:// -cdrom-device %d -fs -zoom -vo xv','larch5'),('DVDRipLocation','/myth/tmp','larch5'),('TitlePlayCommand','mplayer dvd://%t -dvd-device %d -fs -zoom -vo xv -aid %a -channels %c','larch5'),('SubTitleCommand','-sid %s','larch5'),('TranscodeCommand','transcode','larch5'),('MTDPort','2442','larch5'),('MTDNiceLevel','20','larch5'),('MTDConcurrentTranscodes','1','larch5'),('MTDLogFlag','0','larch5'),('MTDac3Flag','0','larch5'),('MTDxvidFlag','1','larch5'),('mythvideo.TrustTranscodeFRDetect','1','larch5'),('WeatherDBSchemaVer','1000',NULL),('TVVidModeRefreshRate','0','larch5'),('TVVidModeRefreshRate0','0','larch5'),('TVVidModeRefreshRate1','0','larch5'),('TVVidModeRefreshRate2','0','larch5'),('GalleryRecursiveSlideshow','1','larch5'),('WebBrowserZoomLevel','20','larch5'),('WebBrowserCommand','/usr/bin/mythbrowser','larch5'),('WebBrowserScrollMode','1','larch5'),('WebBrowserScrollSpeed','4','larch5'),('WebBrowserHideScrollbars','0','larch5'),('RepeatMode','all','larch5'),('MusicAutoShowPlayer','1','larch5'),('HOSTOSsize','5','larch5'),('HostMyhostname','type_hostname_here','larch5'),('NetworkControlEnabled','1','larch5');
+INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
+('Hostpluginmytharchive','1','larch5'),
+('Hostpluginmythbrowser','1','larch5'),
+('Hostpluginmythcontrols','1','larch5'),
+('Hostpluginmythflix','1','larch5'),
+('Hostpluginmythgallery','1','larch5'),
+('Hostpluginmythgame','1','larch5'),
+('HostpluginmythgameFceu','1','larch5'),
+('HostpluginmythgameMame','1','larch5'),
+('HostpluginmythgameZsnes','1','larch5'),
+('Hostpluginmythmovietime','1','larch5'),
+('Hostpluginmythmusic','1','larch5'),
+('Hostpluginmythnews','1','larch5'),
+('Hostpluginmythphone','1','larch5'),
+('Hostpluginmythsmolt','1','larch5'),
+('Hostpluginmythvideo','1','larch5'),
+('Hostpluginmythvideo_dvdcss','0','larch5'),
+('Hostpluginmythweather','1','larch5'),
+('HostAudiotype','ALSA','larch5'),
+('HostpluginmythgameZsnes','1','larch5'),
+('HostpluginmythgameMame','1','larch5'),
+('Hostpluginmythvideo_dvdcss','0','larch5'),
+('Hostpluginmythappletrailers','1','larch5'),
+('Hostpluginmythstream','1','larch5'),
+('Hostpluginmythvodka','1','larch5'),
+('HostMiro','1','larch5'),
+('HostpluginmythgameXE','1','larch5'),
+('HostpluginmythgameROMDB','1','larch5'),
+('HostXine','1','larch5'),
+('HOSTOSsize','5','larch5'),
+('HostMyhostname','type_hostname_here','larch5'),
+('NetworkControlEnabled','1','larch5'),
+('Hostaccessuser','1','larch5');
+
+INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
+('WOLbackendReconnectWaitTime','5',NULL);
+
+
+/*!40000 ALTER TABLE `settings` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `storagegroup`
+--
+
+DROP TABLE IF EXISTS `storagegroup`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `storagegroup` (
+  `id` int(11) NOT NULL auto_increment,
+  `groupname` varchar(32) NOT NULL,
+  `hostname` varchar(64) NOT NULL default '',
+  `dirname` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `grouphostdir` (`groupname`,`hostname`,`dirname`),
+  KEY `hostname` (`hostname`)
+) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `storagegroup`
+--
+
+LOCK TABLES `storagegroup` WRITE;
+/*!40000 ALTER TABLE `storagegroup` DISABLE KEYS */;
+INSERT INTO `storagegroup` (`id`, `groupname`, `hostname`, `dirname`) VALUES (1,'Default','larch5','/myth/tv/');
+/*!40000 ALTER TABLE `storagegroup` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `tvchain`
+--
+
+DROP TABLE IF EXISTS `tvchain`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `tvchain` (
+  `chanid` int(10) unsigned NOT NULL default '0',
+  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
+  `chainid` varchar(128) NOT NULL default '',
+  `chainpos` int(10) NOT NULL default '0',
+  `discontinuity` tinyint(1) NOT NULL default '0',
+  `watching` int(10) NOT NULL default '0',
+  `hostprefix` varchar(128) NOT NULL default '',
+  `cardtype` varchar(32) NOT NULL default 'V4L',
+  `input` varchar(32) NOT NULL default '',
+  `channame` varchar(32) NOT NULL default '',
+  `endtime` datetime NOT NULL default '0000-00-00 00:00:00',
+  PRIMARY KEY  (`chanid`,`starttime`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `tvchain`
+--
+
+LOCK TABLES `tvchain` WRITE;
+/*!40000 ALTER TABLE `tvchain` DISABLE KEYS */;
+/*!40000 ALTER TABLE `tvchain` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `upnpmedia`
+--
+
+DROP TABLE IF EXISTS `upnpmedia`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `upnpmedia` (
+  `intid` int(10) unsigned NOT NULL default '0',
+  `class` varchar(64) NOT NULL default '',
+  `itemtype` varchar(128) NOT NULL default '',
+  `parentid` int(10) unsigned NOT NULL default '0',
+  `itemproperties` varchar(255) NOT NULL default '',
+  `filepath` varchar(512) NOT NULL default '',
+  `title` varchar(255) NOT NULL default '',
+  `filename` varchar(512) NOT NULL default '',
+  `coverart` varchar(512) NOT NULL default '',
+  PRIMARY KEY  (`intid`),
+  KEY `class` (`class`),
+  KEY `filepath` (`filepath`),
+  KEY `parentid` (`parentid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `upnpmedia`
+--
+
+LOCK TABLES `upnpmedia` WRITE;
+/*!40000 ALTER TABLE `upnpmedia` DISABLE KEYS */;
+/*!40000 ALTER TABLE `upnpmedia` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `videocast`
+--
+
+DROP TABLE IF EXISTS `videocast`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `videocast` (
+  `intid` int(10) unsigned NOT NULL auto_increment,
+  `cast` varchar(128) NOT NULL,
+  PRIMARY KEY  (`intid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `videocast`
+--
+
+LOCK TABLES `videocast` WRITE;
+/*!40000 ALTER TABLE `videocast` DISABLE KEYS */;
+/*!40000 ALTER TABLE `videocast` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `videocategory`
+--
+
+DROP TABLE IF EXISTS `videocategory`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `videocategory` (
+  `intid` int(10) unsigned NOT NULL auto_increment,
+  `category` varchar(128) NOT NULL,
+  PRIMARY KEY  (`intid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `videocategory`
+--
+
+LOCK TABLES `videocategory` WRITE;
+/*!40000 ALTER TABLE `videocategory` DISABLE KEYS */;
+/*!40000 ALTER TABLE `videocategory` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `videocountry`
+--
+
+DROP TABLE IF EXISTS `videocountry`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `videocountry` (
+  `intid` int(10) unsigned NOT NULL auto_increment,
+  `country` varchar(128) NOT NULL,
+  PRIMARY KEY  (`intid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `videocountry`
+--
+
+LOCK TABLES `videocountry` WRITE;
+/*!40000 ALTER TABLE `videocountry` DISABLE KEYS */;
+/*!40000 ALTER TABLE `videocountry` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `videogenre`
+--
+
+DROP TABLE IF EXISTS `videogenre`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `videogenre` (
+  `intid` int(10) unsigned NOT NULL auto_increment,
+  `genre` varchar(128) NOT NULL,
+  PRIMARY KEY  (`intid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `videogenre`
+--
+
+LOCK TABLES `videogenre` WRITE;
+/*!40000 ALTER TABLE `videogenre` DISABLE KEYS */;
+/*!40000 ALTER TABLE `videogenre` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `videometadata`
+--
+
+DROP TABLE IF EXISTS `videometadata`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `videometadata` (
+  `intid` int(10) unsigned NOT NULL auto_increment,
+  `title` varchar(128) NOT NULL,
+  `director` varchar(128) NOT NULL,
+  `plot` text,
+  `rating` varchar(128) NOT NULL,
+  `inetref` varchar(255) NOT NULL,
+  `year` int(10) unsigned NOT NULL,
+  `userrating` float NOT NULL,
+  `length` int(10) unsigned NOT NULL,
+  `showlevel` int(10) unsigned NOT NULL,
+  `filename` text NOT NULL,
+  `coverfile` text NOT NULL,
+  `childid` int(11) NOT NULL default '-1',
+  `browse` tinyint(1) NOT NULL default '1',
+  `playcommand` varchar(255) default NULL,
+  `category` int(10) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`intid`),
+  KEY `director` (`director`),
+  KEY `title` (`title`),
+  KEY `title_2` (`title`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `videometadata`
+--
+
+LOCK TABLES `videometadata` WRITE;
+/*!40000 ALTER TABLE `videometadata` DISABLE KEYS */;
+/*!40000 ALTER TABLE `videometadata` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `videometadatacast`
+--
+
+DROP TABLE IF EXISTS `videometadatacast`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `videometadatacast` (
+  `idvideo` int(10) unsigned NOT NULL,
+  `idcast` int(10) unsigned NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `videometadatacast`
+--
+
+LOCK TABLES `videometadatacast` WRITE;
+/*!40000 ALTER TABLE `videometadatacast` DISABLE KEYS */;
+/*!40000 ALTER TABLE `videometadatacast` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `videometadatacountry`
+--
+
+DROP TABLE IF EXISTS `videometadatacountry`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `videometadatacountry` (
+  `idvideo` int(10) unsigned NOT NULL,
+  `idcountry` int(10) unsigned NOT NULL,
+  KEY `idvideo` (`idvideo`),
+  KEY `idcountry` (`idcountry`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `videometadatacountry`
+--
+
+LOCK TABLES `videometadatacountry` WRITE;
+/*!40000 ALTER TABLE `videometadatacountry` DISABLE KEYS */;
+/*!40000 ALTER TABLE `videometadatacountry` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `videometadatagenre`
+--
+
+DROP TABLE IF EXISTS `videometadatagenre`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `videometadatagenre` (
+  `idvideo` int(10) unsigned NOT NULL,
+  `idgenre` int(10) unsigned NOT NULL,
+  KEY `idvideo` (`idvideo`),
+  KEY `idgenre` (`idgenre`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `videometadatagenre`
+--
+
+LOCK TABLES `videometadatagenre` WRITE;
+/*!40000 ALTER TABLE `videometadatagenre` DISABLE KEYS */;
+/*!40000 ALTER TABLE `videometadatagenre` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `videosource`
+--
+
+DROP TABLE IF EXISTS `videosource`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `videosource` (
+  `sourceid` int(10) unsigned NOT NULL auto_increment,
+  `name` varchar(128) NOT NULL default '',
+  `xmltvgrabber` varchar(128) default NULL,
+  `userid` varchar(128) NOT NULL default '',
+  `freqtable` varchar(16) NOT NULL default 'default',
+  `lineupid` varchar(64) default NULL,
+  `password` varchar(64) default NULL,
+  `useeit` smallint(6) NOT NULL default '0',
+  PRIMARY KEY  (`sourceid`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `videosource`
+--
+
+LOCK TABLES `videosource` WRITE;
+/*!40000 ALTER TABLE `videosource` DISABLE KEYS */;
+/*!40000 ALTER TABLE `videosource` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `videotypes`
+--
+
+DROP TABLE IF EXISTS `videotypes`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `videotypes` (
+  `intid` int(10) unsigned NOT NULL auto_increment,
+  `extension` varchar(128) NOT NULL,
+  `playcommand` varchar(255) NOT NULL,
+  `f_ignore` tinyint(1) default NULL,
+  `use_default` tinyint(1) default NULL,
+  PRIMARY KEY  (`intid`)
+) ENGINE=MyISAM AUTO_INCREMENT=11 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `videotypes`
+--
+
+LOCK TABLES `videotypes` WRITE;
+/*!40000 ALTER TABLE `videotypes` DISABLE KEYS */;
+INSERT INTO `videotypes` (`intid`, `extension`, `playcommand`, `f_ignore`, `use_default`) VALUES (1,'txt','',1,0),(2,'log','',1,0),(3,'mpg','Internal',0,0),(4,'avi','',0,1),(5,'vob','Internal',0,0),(6,'mpeg','Internal',0,0),(7,'VIDEO_TS','Internal',0,0),(8,'iso','Internal',0,0),(9,'img','Internal',0,0),(10,'mkv','Internal',0,1);
+/*!40000 ALTER TABLE `videotypes` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `weatherdatalayout`
+--
+
+DROP TABLE IF EXISTS `weatherdatalayout`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `weatherdatalayout` (
+  `location` varchar(64) NOT NULL,
+  `dataitem` varchar(64) NOT NULL,
+  `weatherscreens_screen_id` int(10) unsigned NOT NULL,
+  `weathersourcesettings_sourceid` int(10) unsigned NOT NULL,
+  PRIMARY KEY  (`location`,`dataitem`,`weatherscreens_screen_id`,`weathersourcesettings_sourceid`),
+  KEY `weatherdatalayout_FKIndex1` (`weatherscreens_screen_id`),
+  KEY `weatherdatalayout_FKIndex2` (`weathersourcesettings_sourceid`),
+  CONSTRAINT `weatherdatalayout_ibfk_1` FOREIGN KEY (`weatherscreens_screen_id`) REFERENCES `weatherscreens` (`screen_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `weatherdatalayout_ibfk_2` FOREIGN KEY (`weathersourcesettings_sourceid`) REFERENCES `weathersourcesettings` (`sourceid`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `weatherdatalayout`
+--
+
+LOCK TABLES `weatherdatalayout` WRITE;
+/*!40000 ALTER TABLE `weatherdatalayout` DISABLE KEYS */;
+/*!40000 ALTER TABLE `weatherdatalayout` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `weatherscreens`
+--
+
+DROP TABLE IF EXISTS `weatherscreens`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `weatherscreens` (
+  `screen_id` int(10) unsigned NOT NULL auto_increment,
+  `draworder` int(10) unsigned NOT NULL,
+  `container` varchar(64) NOT NULL,
+  `hostname` varchar(255) default NULL,
+  `units` tinyint(3) unsigned NOT NULL,
+  PRIMARY KEY  (`screen_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `weatherscreens`
+--
+
+LOCK TABLES `weatherscreens` WRITE;
+/*!40000 ALTER TABLE `weatherscreens` DISABLE KEYS */;
+/*!40000 ALTER TABLE `weatherscreens` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `weathersourcesettings`
+--
+
+DROP TABLE IF EXISTS `weathersourcesettings`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `weathersourcesettings` (
+  `sourceid` int(10) unsigned NOT NULL auto_increment,
+  `source_name` varchar(64) NOT NULL,
+  `update_timeout` int(10) unsigned NOT NULL default '600',
+  `retrieve_timeout` int(10) unsigned NOT NULL default '60',
+  `hostname` varchar(255) default NULL,
+  `path` varchar(255) default NULL,
+  `author` varchar(128) default NULL,
+  `version` varchar(32) default NULL,
+  `email` varchar(255) default NULL,
+  `types` mediumtext,
+  PRIMARY KEY  (`sourceid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `weathersourcesettings`
+--
+
+LOCK TABLES `weathersourcesettings` WRITE;
+/*!40000 ALTER TABLE `weathersourcesettings` DISABLE KEYS */;
+/*!40000 ALTER TABLE `weathersourcesettings` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `websites`
+--
+
+DROP TABLE IF EXISTS `websites`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `websites` (
+  `grp` varchar(255) NOT NULL,
+  `dsc` varchar(255) default NULL,
+  `url` varchar(255) NOT NULL,
+  `updated` int(10) unsigned default NULL,
+  PRIMARY KEY  (`url`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `websites`
+--
+
+LOCK TABLES `websites` WRITE;
+/*!40000 ALTER TABLE `websites` DISABLE KEYS */;
+INSERT INTO `websites` (`grp`, `dsc`, `url`, `updated`) VALUES ('LinHES','','http://knoppmyth.net',NULL),('LinHES','','http://knoppmythwiki.org',NULL);
+/*!40000 ALTER TABLE `websites` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2008-09-07 21:09:33
diff --git a/abs/core-testing/mythdb-initial/mythdb.install b/abs/core-testing/mythdb-initial/mythdb.install
new file mode 100755
index 0000000..4834c69
--- /dev/null
+++ b/abs/core-testing/mythdb-initial/mythdb.install
@@ -0,0 +1,31 @@
+mydate=`date +%m-%d-%y`
+HOST=`hostname`
+post_install() {
+#echo backup the old database
+	mysqldump mythconverg   >/data/database/mythconverg.${mydate}.sql 
+#	echo dropping the old database
+	mysql -u root -e 'drop database mythconverg;' 
+        mysql -u root -e 'create database mythconverg;'  
+	echo installing the default database
+	if [  $HOST = 'larch5' ]
+	then
+           cp /data/database/mc.sql.initial /data/database/mc.sql.fixed
+	   cp /data/database/permissions.sql  /data/database/permissions.sql.fixed
+	else
+	    sed -e "s/larch5/$HOST/g" /data/database/mc.sql.initial > /data/database/mc.sql.fixed
+	    sed -e "s/larch5/$HOST/g" /data/database/permissions.sql > /data/database/permissions.sql.fixed
+
+	fi
+		
+	mysql mythconverg < /data/database/mc.sql.fixed 2>/dev/null 
+	mysql < /data/database/permissions.sql.fixed 2>/dev/null 
+
+	rm /data/database/mc.sql.initial
+}
+post_upgrade() {
+	echo "nothing to do"
+}
+
+op=$1 
+shift 
+$op $*
diff --git a/abs/core-testing/mythdb-initial/permissions.sql b/abs/core-testing/mythdb-initial/permissions.sql
new file mode 100755
index 0000000..5a36e15
--- /dev/null
+++ b/abs/core-testing/mythdb-initial/permissions.sql
@@ -0,0 +1,11 @@
+ 
+GRANT ALL ON mythconverg.* TO mythtv@localhost IDENTIFIED BY "mythtv";
+GRANT ALL ON mythconverg.* TO mythtv@'%' IDENTIFIED BY "mythtv";
+GRANT ALL ON mythconverg.* TO mythtv@myhost IDENTIFIED BY "mythtv";
+GRANT FILE ON *.* TO 'mythtv'@'%';
+FLUSH PRIVILEGES;
+GRANT CREATE TEMPORARY TABLES ON mythconverg.* TO mythtv@localhost IDENTIFIED BY "mythtv";
+GRANT CREATE TEMPORARY TABLES ON mythconverg.* TO mythtv@'%' IDENTIFIED BY "mythtv";
+GRANT CREATE TEMPORARY TABLES ON mythconverg.* TO mythtv@myhost IDENTIFIED BY "mythtv";
+FLUSH PRIVILEGES;
+ALTER DATABASE mythconverg DEFAULT CHARACTER SET latin1;
diff --git a/abs/core-testing/mythinstall-22/PKGBUILD b/abs/core-testing/mythinstall-22/PKGBUILD
deleted file mode 100644
index d9f7804..0000000
--- a/abs/core-testing/mythinstall-22/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Jams
-pkgname=mythinstall-22
-pkgver=2
-pkgrel=7
-pkgdesc="LinHES installer/systemconfig GUI."
-arch=i686
-depends=()
-makedepends=('mythtv>=0.22')
-
-source=(mythinstall.bin)
-
-build() {
-
-#   It is assumed that you have built the mythtv package in the same 
-#   LinHES-PKGBUILD area.
-    cd $startdir
-    ./checkout_MythVantage.sh || exit 1
-    cd -
-    install -D MythVantage-app/mythinstall/install-ui.xml $pkgdir/usr/share/mythtv/themes/default/install-ui.xml
-    MVBINDIR=$startdir/pkg/usr/MythVantage/bin
-    mkdir -p $MVBINDIR
-    install -m 0755 mythinstall.bin $MVBINDIR/MythVantage
-    cd $MVBINDIR
-    ln -s MythVantage mythvantage
-    ln -s MythVantage mythinstall
-    cd -
-
-}
diff --git a/abs/core-testing/mythinstall-22/checkout_MythVantage.sh b/abs/core-testing/mythinstall-22/checkout_MythVantage.sh
deleted file mode 100755
index 58849bf..0000000
--- a/abs/core-testing/mythinstall-22/checkout_MythVantage.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-MYDIR=`pwd`
-MYTHPATH="\/data\/LinHES-PKGBUILD\/abs\/core-testing\/mythtv\/stable-0.22\/mythtv\/src\/mythtv"
-
-function setup_links {
-rm mythinstall.bin
-rm mythbeselect.bin
-ln -s  $MYDIR/src/MythVantage-app/mythinstall/mythinstall ./mythinstall.bin
-ln -s  $MYDIR/src/MythVantage-app/mythbeselect/mythbeselect ./mythbeselect.bin
-}
-
-function dl_repo {
-mkdir src
-cd src
-if [ ! -d MythVantage-app ]
-then
-    git clone http://mythvantage.com/MythVantage-app.git/
-    cd MythVantage-app
-    git checkout --track -b  LinHES origin/LinHES
-    cd $MYDIR
-    setup_links
-    cd -
-else
-    echo "updating exisiting tree"
-    cd MythVantage-app
-    git pull
-    git checkout master
-    git merge
-    cd -
-fi
-
-cd MythVantage-app
-git checkout master
-#git checkout origin/LinHES
-
-}
-
-dl_repo
-sed -i "s/^MYTHPATH.*$/MYTHPATH\=\"$MYTHPATH\"/g"  $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
-sed -i "s/#define __MVAPP__/\/\/#define __MVAPP__/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common.h
-sed -i "s/mythvantage/LinHES/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common.h
-
-echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythbeselect/mythberestart.pro
-echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
-cd $MYDIR/src/MythVantage-app/mythinstall && qmake
-make || exit 1
-#cd $MYDIR/src/MythVantage-app/mythbeselect && qmake
-#make ||exit 1
-
diff --git a/abs/core-testing/mythinstall/PKGBUILD b/abs/core-testing/mythinstall/PKGBUILD
index bd58a19..0e0508a 100644
--- a/abs/core-testing/mythinstall/PKGBUILD
+++ b/abs/core-testing/mythinstall/PKGBUILD
@@ -1,49 +1,28 @@
 # Maintainer: Jams
 pkgname=mythinstall
-pkgver=1
-pkgrel=13
+pkgver=2
+pkgrel=10
 pkgdesc="LinHES installer/systemconfig GUI."
 arch=i686
 depends=()
-makedepends=(mythtv)
+makedepends=('mythtv>=0.22')
 
-source=(autocard.cpp
-	autocard.h
-	infrared.cpp
-	infrared.h
-	installationtype.cpp
-	installationtype.h
-	installdialog.cpp
-	installdialog.h
-	installsettings.cpp
-	installsettings.h
-	main.cpp
-	misc_settings.cpp
-	misc_settings.h
-	mv_common.h
-	mythinstall.pro
-	password_manage.cpp
-	password_manage.h
-	settemplate.cpp
-	settemplate.h
-	statusbox.cpp
-	statusbox.h
-	xorgsettings.cpp
-	xorgsettings.h)
+source=(mythinstall.bin)
 
 build() {
 
 #   It is assumed that you have built the mythtv package in the same 
 #   LinHES-PKGBUILD area.
-
-    cd ${srcdir}
-    qmake mythinstall.pro || return 1
-    make || return 1
+    cd $startdir
+    ./checkout_MythVantage.sh || exit 1
+    cd -
+    install -D MythVantage-app/mythinstall/install-ui.xml $pkgdir/usr/share/mythtv/themes/default/install-ui.xml
     MVBINDIR=$startdir/pkg/usr/MythVantage/bin
     mkdir -p $MVBINDIR
-    install -m 0755 mythinstall $MVBINDIR/MythVantage
+    install -m 0755 mythinstall.bin $MVBINDIR/MythVantage
     cd $MVBINDIR
     ln -s MythVantage mythvantage
     ln -s MythVantage mythinstall
     cd -
+
 }
diff --git a/abs/core-testing/mythinstall/autocard.cpp b/abs/core-testing/mythinstall/autocard.cpp
deleted file mode 100755
index 585fba7..0000000
--- a/abs/core-testing/mythinstall/autocard.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-#include "libmyth/mythcontext.h"
-#include "libmyth/mythdbcon.h"
-#include <qsqldatabase.h>
-#include <qheader.h>
-#include <qcursor.h>
-#include <qlayout.h>
-#include <iostream>
-#include "autocard.h"
-#include <stdlib.h>
-#include <cstdlib>
-
-AutoCard::AutoCard(void) :
-    listbox(new ListBoxSetting(this))
-{
-    listbox->setLabel(tr("Cards"));
-    addChild(listbox);
-}
-void AutoCard::popup_menu(void)
-{
-    QString name = listbox->getValue();
-//     cout << "in popup" <<  name << endl;
-    QString uniqid =  name.section(' ', -1);
-    QString description = name.section('*',-3,-3);
-    description = description.section('.',1);
-    description = description.stripWhiteSpace();
-//     cout << uniqid << endl;
-//     cout << "descriptn" << endl;
-//     cout << description << endl;
-    if (name.isEmpty() || name == "Default")
-        return;
-
-    QString message = tr("Cardme:") +
-        QString("\n'%1'?").arg(name);
-
-    DialogCode  value = MythPopupBox::Show2ButtonPopup(gContext->GetMainWindow(),
-                                               "", message,
-                                               tr("Add Card"),
-                                               tr("Do not Add"), kDialogCodeButton0);
-
-    if ( value == kDialogCodeButton1)
-    {
-        MSqlQuery query(MSqlQuery::InitCon());
-        query.prepare("update autocard set devicestatus ='unused' where uniqid=:UNIQID and description=:DESCRIPTION;");
-         query.bindValue(":UNIQID",uniqid );
-        query.bindValue(":DESCRIPTION",description );
-        if (!query.exec())
-            MythContext::DBError("Autocard::popup", query);
-
-        int lastIndex = listbox->getValueIndex(name);
-        lastValue = "";
-        load();
-        listbox->setValue(lastIndex);
-    }
-    else if (value == kDialogCodeButton0)
-    {
-        MSqlQuery query(MSqlQuery::InitCon());
-        query.prepare("update autocard set devicestatus ='will-add' where uniqid=:UNIQID and description=:DESCRIPTION;");
-        query.bindValue(":UNIQID",uniqid );
-        query.bindValue(":DESCRIPTION",description );
-
-
-        if (!query.exec())
-            MythContext::DBError("Autocard::popup", query);
-
-        int lastIndex = listbox->getValueIndex(name);
-        lastValue = "";
-        load();
-        listbox->setValue(lastIndex);
-
-
-
-
-    }
-
-
-    listbox->setFocus();
-}
-
-
-
-QStringList AutoCard::GetNames(void)
-{
-    QStringList names;
-    QString device;
-    QString description;
-    QString displayname ;
-    QString status ;
-    QString uniqid;
-    MSqlQuery query(MSqlQuery::InitCon());
-    query.prepare("SELECT dev,description,uniqid,devicestatus FROM autocard  order by uniqid");
-    if (query.exec() && query.isActive() && query.size() > 0)
-    {
-       while (query.next())
-       {
-            device=query.value(0).toString();
-            description=query.value(1).toString();
-            uniqid=query.value(2).toString();
-            status=query.value(3).toString();
-            //displayname=device;
-            displayname=".     ";
-            displayname.append(description);
-            displayname.append(" * ");
-            displayname.append(status);
-            displayname.append(" * ");
-
-            displayname.append(uniqid);
-            names << displayname  ;
-       }
-
-    return names;
-    }
-}
-
-void AutoCard::open(QString name)
-{
-    lastValue = name;
-    bool created = false;
-    cout << name << endl;
-    if (name == "Mark all cards for addition")
-    {
-       cout <<"updating all cards" << endl;
-       MSqlQuery query(MSqlQuery::InitCon());
-       query.prepare("update autocard set devicestatus='will-add' where devicestatus='unused' order by uniqid");
-       query.exec();
-    }
-    else if ( name == "Perform actions" )
-    {
-        // write udev rules and reload udev
-
-       system ("sudo autocard.py -w -i");
-       system ("sudo autocard.py -r");
-
-    }
-    else if ( name == "Exit" )
-    {
-        // write udev rules and reload udev
-        exit(0);
-    }
-    else
-    {
-    popup_menu();
-// bool ok = MythPopupBox::showGetTextPopup(gContext->GetMainWindow(),
-//             tr("Create New Playback Group"),
-//             tr("Enter group name or press SELECT to enter text via the "
-//                "On Screen Keyboard"), name);
-
-
-    }
-
-};
-
-void AutoCard::load(void)
-{
-    listbox->clearSelections();
-
-
-    QStringList names = AutoCard::GetNames();
-    while (!names.isEmpty())
-    {
-        listbox->addSelection(names.front());
-        names.pop_front();
-    }
-    listbox->addSelection("Mark all cards for addition");
-    listbox->addSelection("Perform actions");
-    listbox->addSelection("Exit");
-    listbox->setValue(lastValue);
-
-}
-
-
-int AutoCard::exec(void)
-{
-    while (ConfigurationDialog::exec() == QDialog::Accepted)
-        open(listbox->getValue());
-
-    return QDialog::Rejected;
-}
-
-
-MythDialog* AutoCard::dialogWidget(MythMainWindow* parent,
-                                          const char* widgetName)
-{
-    dialog = ConfigurationDialog::dialogWidget(parent, widgetName);
-    connect(dialog, SIGNAL(menuButtonPressed()), this, SLOT(popup_menu()));
-    return dialog;
-}
diff --git a/abs/core-testing/mythinstall/autocard.h b/abs/core-testing/mythinstall/autocard.h
deleted file mode 100755
index 623fcc0..0000000
--- a/abs/core-testing/mythinstall/autocard.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef AUTOCARD_H
-#define AUTOCARD_H
-
-#include "qstringlist.h"
-#include "libmyth/settings.h"
-#include "libmyth/mythwidgets.h"
-
-class MPUBLIC AutoCard : public QObject, public ConfigurationDialog
-{
-    Q_OBJECT
-
-  public:
-    AutoCard();
-    virtual int exec(void);
-    virtual void load(void);
-    virtual void save(void) { };
-    virtual void save(QString) { };
-    virtual MythDialog* dialogWidget(MythMainWindow* parent,
-                                     const char* widgetName=0);
- static QStringList GetNames(void);
-  protected slots:
-    void open(QString name);
-    void popup_menu(void);
-
-  protected:
-    ListBoxSetting *listbox;
-    QString         lastValue;
-};
-
-#endif
diff --git a/abs/core-testing/mythinstall/checkout_MythVantage.sh b/abs/core-testing/mythinstall/checkout_MythVantage.sh
new file mode 100755
index 0000000..58849bf
--- /dev/null
+++ b/abs/core-testing/mythinstall/checkout_MythVantage.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+MYDIR=`pwd`
+MYTHPATH="\/data\/LinHES-PKGBUILD\/abs\/core-testing\/mythtv\/stable-0.22\/mythtv\/src\/mythtv"
+
+function setup_links {
+rm mythinstall.bin
+rm mythbeselect.bin
+ln -s  $MYDIR/src/MythVantage-app/mythinstall/mythinstall ./mythinstall.bin
+ln -s  $MYDIR/src/MythVantage-app/mythbeselect/mythbeselect ./mythbeselect.bin
+}
+
+function dl_repo {
+mkdir src
+cd src
+if [ ! -d MythVantage-app ]
+then
+    git clone http://mythvantage.com/MythVantage-app.git/
+    cd MythVantage-app
+    git checkout --track -b  LinHES origin/LinHES
+    cd $MYDIR
+    setup_links
+    cd -
+else
+    echo "updating exisiting tree"
+    cd MythVantage-app
+    git pull
+    git checkout master
+    git merge
+    cd -
+fi
+
+cd MythVantage-app
+git checkout master
+#git checkout origin/LinHES
+
+}
+
+dl_repo
+sed -i "s/^MYTHPATH.*$/MYTHPATH\=\"$MYTHPATH\"/g"  $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
+sed -i "s/#define __MVAPP__/\/\/#define __MVAPP__/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common.h
+sed -i "s/mythvantage/LinHES/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common.h
+
+echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythbeselect/mythberestart.pro
+echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
+cd $MYDIR/src/MythVantage-app/mythinstall && qmake
+make || exit 1
+#cd $MYDIR/src/MythVantage-app/mythbeselect && qmake
+#make ||exit 1
+
diff --git a/abs/core-testing/mythinstall/infrared.cpp b/abs/core-testing/mythinstall/infrared.cpp
deleted file mode 100755
index 2f56ae5..0000000
--- a/abs/core-testing/mythinstall/infrared.cpp
+++ /dev/null
@@ -1,368 +0,0 @@
-#include <mythcontext.h>
-#include <unistd.h>
-#include <iostream>
-#include <fstream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <cstdlib>
-#include "misc_settings.h"
-#include "infrared.h"
-#include "mv_common.h"
-#include "uitypes.h"
-
-extern  HostParms hostparm;
-
-
-HostRemoteTypeIR::HostRemoteTypeIR():
-    HostImageSelect("HostRemoteType") {
-    setLabel(QObject::tr("Remote"));
-    QString dirtxt;
-    dirtxt=MV_ROOT;
-    dirtxt.append("templates/remotes");
-    QDir remotes(dirtxt);
-    remotes.setFilter(QDir::Dirs);
-    remotes.setSorting(QDir::Name | QDir::IgnoreCase);
-    const QFileInfoList *fil = remotes.entryInfoList(QDir::Dirs);
-    if (!fil)
-        return;
-    QFileInfoListIterator it( *fil );
-    QFileInfo *remote;
-    for( ; it.current() != 0 ; ++it )
-    {
-        remote = it.current();
-        QFileInfo preview(remote->absFilePath() + "/preview.jpg");
-            if (remote->fileName()[0] == '.' || !preview.exists() )
-            {
-             VERBOSE(VB_IMPORTANT, remote->absFilePath() + "Can't find preivew image, doesn't look like a remote\n");
-            continue;
-            }
-        QImage* previewImage = new QImage(preview.absFilePath());
-        addImageSelection(remote->fileName(), previewImage);
-    }
-};
-
-static HostComboBox *HostReceiverType()
-{
-    HostComboBox *gc = new HostComboBox("HostReceiverType");
-    gc->setLabel(QObject::tr("Receiver"));
-    gc->addSelection("Default");
-    gc->addSelection("tinker");
-    gc->addSelection("Serial");
-    gc->addSelection("imon");
-    gc->addSelection("Hauppauge");
-    gc->addSelection("tinker");
-    gc->addSelection("CommandIR");
-    gc->addSelection("iguanaIR-usb");
-    gc->addSelection("mceusb");
-    gc->addSelection("mod_mce");
-    gc->addSelection("pvr150");
-    gc->addSelection("streamzap");
-    gc->addSelection("tatir");
-    gc->setHelpText(QObject::tr("The type of infrared receiver used."));
-    gc->setValue("Default");
-    return gc;
-};
-
-
-
-static HostComboBox *HostSerialPortlirc()
-{
-    HostComboBox *gc = new HostComboBox("HostSerialPortlirc",false);
-    gc->setLabel(QObject::tr("Serial Port"));
-    gc->addSelection("ttyS0");
-    gc->addSelection("ttyS1");
-    gc->addSelection("ttyS2");
-    gc->addSelection("ttyS3");
-    gc->setHelpText(QObject::tr("Serial port with the lirc receiver or transmitter"));
-    return gc;
-}
-
-class LIRC_ReceiverSettings: public TriggeredConfigurationGroup {
-public:
-    LIRC_ReceiverSettings():
-        TriggeredConfigurationGroup(false, false, true, true,false, false, true, true) {
-        Setting* trigger =  HostReceiverType() ;
-        addChild(trigger);
-        setTrigger(trigger);
-
-        ConfigurationGroup* blanksettings = new GridConfigurationGroup(2,true);
-
-        ConfigurationGroup* settings = new GridConfigurationGroup(2,true);
-        settings->addChild(HostSerialPortlirc());
-
-        addTarget("Default", blanksettings);
-        addTarget("Serial", settings);
-        addTarget("imon", blanksettings );
-        addTarget("Hauppauge",blanksettings);
-        addTarget("tinker", blanksettings );
-        addTarget("imon", blanksettings);
-        addTarget("Hauppauge", blanksettings);
-        addTarget("CommandIR", blanksettings);
-        addTarget("iguanaIR-usb", blanksettings);
-        addTarget("mceusb", blanksettings);
-        addTarget("mod_mce", blanksettings);
-        addTarget("pvr150", blanksettings);
-        addTarget("streamzap", blanksettings);
-        addTarget("tatir", blanksettings);
-    };
-};
-
-
-
-IRFrame::IRFrame():
- VerticalConfigurationGroup(false,false,false,false)
- {
-       LIRC_ReceiverSettings *receiversettings = new LIRC_ReceiverSettings();
-       addChild(new HostRemoteTypeIR());
-       addChild(receiversettings);
- }
-
-
-//----------------transmit settings--------------
-static HostComboBox *HostTransmitproto_1()
-{
-    HostComboBox *gc = new HostComboBox("HostTransmitproto_1",false);
-    gc->setLabel(QObject::tr("Transmitter"));
-    gc->addSelection("none");
-    gc->setValue(0);
-    gc->setHelpText(QObject::tr("Remote codes to control a cable box"));
-    QString dirtxt;
-    dirtxt=MV_ROOT;
-    dirtxt.append("templates/transmit");
-    QDir transmit(dirtxt);
-    transmit.setFilter(QDir::Dirs);
-    transmit.setSorting(QDir::Name | QDir::IgnoreCase);
-    const QFileInfoList *infos = transmit.entryInfoList();
-    const QFileInfo *info;
-    if (!infos)
-        return gc;
-    QFileInfoListIterator infoIt( *infos );
-    QString currentitem = ".";
-    while( (info=infoIt.current()) != 0 )
-    {
-        currentitem = info->baseName( TRUE );
-        if ( currentitem != ".." && currentitem != "." && currentitem != "")
-        {
-            gc->addSelection(currentitem);
-        }
-        ++infoIt;
-    }
-    return gc;
-};
-
-static HostComboBox *HostTransmitproto_2()
-{
-    HostComboBox *gc = new HostComboBox("HostTransmitproto_2",false);
-    gc->setLabel(QObject::tr("Transmitter"));
-    gc->addSelection("none");
-    gc->setValue(0);
-    gc->setHelpText(QObject::tr("Remote codes to control a cable box"));
-    QString dirtxt;
-    dirtxt=MV_ROOT;
-    dirtxt.append("templates/transmit");
-    QDir transmit(dirtxt);
-    transmit.setFilter(QDir::Dirs);
-    transmit.setSorting(QDir::Name | QDir::IgnoreCase);
-    const QFileInfoList *infos = transmit.entryInfoList();
-    const QFileInfo *info;
-    if (!infos)
-        return gc;
-    QFileInfoListIterator infoIt( *infos );
-    QString currentitem = ".";
-    while( (info=infoIt.current()) != 0 )
-    {
-        currentitem = info->baseName( TRUE );
-        if ( currentitem != ".." && currentitem != "." && currentitem != "")
-        {
-            gc->addSelection(currentitem);
-        }
-        ++infoIt;
-    }
-    return gc;
-};
-
-static HostComboBox *HostTransmitproto_3()
-{
-    HostComboBox *gc = new HostComboBox("HostTransmitproto_3",false);
-    gc->setLabel(QObject::tr("Transmitter"));
-    gc->addSelection("none");
-    gc->setValue(0);
-    gc->setHelpText(QObject::tr("Remote codes to control a cable box"));
-    QString dirtxt;
-    dirtxt=MV_ROOT;
-    dirtxt.append("templates/transmit");
-    QDir transmit(dirtxt);
-    transmit.setFilter(QDir::Dirs);
-    transmit.setSorting(QDir::Name | QDir::IgnoreCase);
-    const QFileInfoList *infos = transmit.entryInfoList();
-    const QFileInfo *info;
-    if (!infos)
-        return gc;
-    QFileInfoListIterator infoIt( *infos );
-    QString currentitem = ".";
-    while( (info=infoIt.current()) != 0 )
-    {
-        currentitem = info->baseName( TRUE );
-        if ( currentitem != ".." && currentitem != "." && currentitem != "")
-        {
-            gc->addSelection(currentitem);
-        }
-        ++infoIt;
-    }
-    return gc;
-};
-
-static HostComboBox *HostTransmitproto_4()
-{
-    HostComboBox *gc = new HostComboBox("HostTransmitproto_4",false);
-    gc->setLabel(QObject::tr("Transmitter"));
-    gc->addSelection("none");
-    gc->setValue(0);
-    gc->setHelpText(QObject::tr("Remote codes to control a cable box"));
-    QString dirtxt;
-    dirtxt=MV_ROOT;
-    dirtxt.append("templates/transmit");
-    QDir transmit(dirtxt);
-    transmit.setFilter(QDir::Dirs);
-    transmit.setSorting(QDir::Name | QDir::IgnoreCase);
-    const QFileInfoList *infos = transmit.entryInfoList();
-    const QFileInfo *info;
-    if (!infos)
-        return gc;
-    QFileInfoListIterator infoIt( *infos );
-    QString currentitem = ".";
-    while( (info=infoIt.current()) != 0 )
-    {
-        currentitem = info->baseName( TRUE );
-        if ( currentitem != ".." && currentitem != "." && currentitem != "")
-        {
-            gc->addSelection(currentitem);
-        }
-        ++infoIt;
-    }
-    return gc;
-};
-
-
-static HostComboBox *HostBlasterType()
-{
-    HostComboBox *gc = new HostComboBox("HostBlasterType");
-    gc->setLabel(QObject::tr("Blaster"));
-    gc->addSelection("None");
-    gc->addSelection("Receiver");
-    gc->addSelection("Serial");
-    gc->addSelection("CommandIR");
-    //gc->addSelection("Hauppauge");
-    gc->addSelection("MCE");
-    gc->addSelection("pvr150");
-    gc->addSelection("iguanaIR-usb");
-    gc->setHelpText(QObject::tr("The type of infrared transmitter being used.  Selecting CommandIR will use that device for both transmiting and receiving.  Any other receiver will be disabled."));
-    gc->setValue("None");
-    return gc;
-};
-
-static HostComboBox *HostSerialPort_blasterlirc()
-{
-    HostComboBox *gc = new HostComboBox("HostSerialPort_blasterlirc",false);
-    gc->setLabel(QObject::tr("Serial Port"));
-    gc->addSelection("ttyS0");
-    gc->addSelection("ttyS1");
-    gc->addSelection("ttyS2");
-    gc->addSelection("ttyS3");
-    gc->setHelpText(QObject::tr("Serial port with the lirc transmitter"));
-    return gc;
-}
-
-
-
-class LIRC_BlasterSettings: public TriggeredConfigurationGroup {
-public:
-    LIRC_BlasterSettings():
-        TriggeredConfigurationGroup(false, false, true, true,false, false, true, true) {
-        Setting* trigger =  HostBlasterType() ;
-        addChild(trigger);
-        setTrigger(trigger);
-
-        ConfigurationGroup* blanksettings = new GridConfigurationGroup(2,true);
-
-        ConfigurationGroup* settings = new GridConfigurationGroup(1,true);
-            settings->addChild(HostTransmitproto_1());
-
-        ConfigurationGroup* CommandIRsettings = new GridConfigurationGroup(1,true);
-            CommandIRsettings->addChild(HostTransmitproto_1());
-            CommandIRsettings->addChild(HostTransmitproto_2());
-            CommandIRsettings->addChild(HostTransmitproto_3());
-            CommandIRsettings->addChild(HostTransmitproto_4());
-
-        ConfigurationGroup* mcesettings = new GridConfigurationGroup(1,true);
-            mcesettings->addChild(HostTransmitproto_1());
-            mcesettings->addChild(HostTransmitproto_2());
-
-
-
-        ConfigurationGroup* serial_settings = new GridConfigurationGroup(1,true);
-        serial_settings->addChild(HostSerialPort_blasterlirc());
-        serial_settings->addChild(HostTransmitproto_1());
-        addTarget("None", blanksettings);
-        addTarget("Receiver", settings);
-        addTarget("Serial", serial_settings);
-        addTarget("CommandIR", CommandIRsettings);
-        addTarget("pvr150",blanksettings);
-        addTarget("MCE",mcesettings);
-        addTarget("iguanaIR-usb",mcesettings);
-//        addTarget("tinker", blanksettings );
-    };
-};
-
-IR_TransmitFrame::IR_TransmitFrame():
- VerticalConfigurationGroup(false,false,false,false)
- {
-       LIRC_BlasterSettings *blastersettings = new LIRC_BlasterSettings();
-       addChild(blastersettings);
- }
-
-//------------------LCD settings-------------
-
-
-
-static HostComboBox *HostLCDType()
-{
-    HostComboBox *gc = new HostComboBox("HostLCDType",false);
-    gc->setLabel(QObject::tr("LCD/VFD model"));
-    gc->addSelection("no_lcd");
-    gc->addSelection("tinker");
-    gc->setValue(0);
-    gc->setHelpText(QObject::tr("VFD or LCD"));
-    QString dirtxt;
-    dirtxt=MV_ROOT;
-    dirtxt.append("templates/LCD");
-    QDir transmit(dirtxt);
-
-    //QDir transmit("/usr/share/templates/LCD");
-    transmit.setFilter(QDir::Dirs);
-    transmit.setSorting(QDir::Name | QDir::IgnoreCase);
-    const QFileInfoList *infos = transmit.entryInfoList();
-    const QFileInfo *info;
-    if (!infos)
-        return gc;
-    QFileInfoListIterator infoIt( *infos );
-    QString currentitem = ".";
-    while( (info=infoIt.current()) != 0 )
-        {
-            currentitem = info->baseName( TRUE );
-            if ( currentitem != ".." && currentitem != "." && currentitem != "")
-            {
-            gc->addSelection(currentitem);
-            }
-        ++infoIt;
-        }
-    return gc;
-};
-
-LCDFrame::LCDFrame():
- VerticalConfigurationGroup(false,false,false,false)
- {
-       addChild(HostLCDType());
- }
-
-
diff --git a/abs/core-testing/mythinstall/infrared.h b/abs/core-testing/mythinstall/infrared.h
deleted file mode 100755
index c647952..0000000
--- a/abs/core-testing/mythinstall/infrared.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <mythcontext.h>
-#include <unistd.h>
-#include <iostream>
-#include <fstream>
-#include <stdio.h>
-#include "settings.h"
-#include "installsettings.h"
-#include <qsqldatabase.h>
-#include <qsqlquery.h>
-
-#include <stdlib.h>
-#include <cstdlib>
-#include <mythtv/mythdbcon.h>
-#include <qdir.h>
-#include <qapplication.h>
-#include "util.h"
-
-class IRFrame: public VerticalConfigurationGroup {
- public:
-         IRFrame();
- };
-
-
-class HostRemoteTypeIR: public HostImageSelect {
-public:
-    HostRemoteTypeIR();
-};
-
-class IR_TransmitFrame: public VerticalConfigurationGroup {
- public:
-         IR_TransmitFrame();
-
- };
-
-class LCDFrame: public VerticalConfigurationGroup {
- public:
-         LCDFrame();
-
- };
-
-
-
-
-
-
diff --git a/abs/core-testing/mythinstall/install-ui.xml b/abs/core-testing/mythinstall/install-ui.xml
deleted file mode 100755
index 8cebd11..0000000
--- a/abs/core-testing/mythinstall/install-ui.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<!--
-
-    This is a myth style theme file for mythwelcome
-
-    (c) 2005 by a whole bunch of people associated with MythTV
-
--->
-<mythuitheme>
-
-    <window name="welcome_screen">
-
-        <!--
-
-            First, define all the fonts we need on this screen
-
-        -->
-       <font name="title" face="Arial">
-           <color>#ffff00</color>
-           <dropcolor>#000000</dropcolor>
-           <size>24</size>
-           <shadow>3,3</shadow>
-           <bold>yes</bold>
-       </font>
-
-       <font name="time" face="Arial">
-            <color>#9999cc</color>
-            <size>18</size>
-            <bold>yes</bold>
-       </font>
-
-       <font name="label" face="Arial">
-            <color>#ffff00</color>
-            <dropcolor>#000000</dropcolor>
-            <size>18</size>
-            <shadow>3,3</shadow>
-            <bold>yes</bold>
-       </font>
-
-       <font name="info" face="Arial">
-            <color>#ffffff</color>
-            <size>18</size>
-            <bold>yes</bold>
-       </font>
-
-       <font name="biginfo" face="Arial">
-	       <color>#ffffff</color>
-	       <size>50</size>
-	       <bold>yes</bold>
-       </font>
-       <font name="warning" face="Arial">
-            <color>#ff0000</color>
-            <dropcolor>#000000</dropcolor>
-            <size>16</size>
-            <shadow>2,2</shadow>
-            <bold>yes</bold>
-       </font>
-
-       <font name="buttons" face="Arial">
-            <color>#ffff00</color>
-            <size>14</size>
-            <bold>yes</bold>
-       </font>
-       <font name="tinyinfo" face="Arial">
-           <color>#9999cc</color>
-           <size>12</size>
-           <bold>no</bold>
-       </font>
-
-       <container name="main_display">
-            <area>0,0,800,600</area>
-
-            <textarea name="title" draworder="0" align="center">
-                <multiline>no</multiline>
-                <font>title</font>
-                <area>50,40,700,40</area>
-                <value>Welcome to  MythVantage! </value>
-            </textarea>
-
-            <!--
-                time
-            -->
-            <textarea name="time_text" draworder="0" align="right">
-                <multiline>no</multiline>
-                <font>time</font>
-                <area>660,520,110,30</area>
-                <value></value>
-            </textarea>
-
-            <textarea name="date_text" draworder="0" align="hcenter">
-                <multiline>yes</multiline>
-                <font>time</font>
-                <area>20,75,740,100</area>
-                <value></value>
-            </textarea>
-
-            <!--
-                current myth status
-            -->
-
-            <textarea name="status_text" draworder="1" align="center">
-                <multiline>yes</multiline>
-                <font>info</font>
-                <area>20,100,760,60</area>
-                <value>MythTV is idle and will shutdown shortly.</value>
-            </textarea>
-
-            <!--
-                current recordings status
-            -->
-
-            <textarea name="recording_label" draworder="1" align="center">
-                <font>label</font>
-                <area>20,140,760,30</area>
-                <!--<value>Percent Complete </value>-->
-                 <value></value>
-            </textarea>
-
-            <textarea name="recording_text" draworder="1" align="hcenter">
-                <multiline>yes</multiline>
-                <font>biginfo</font>
-                <area>20,140,760,150</area>
-                <value></value>
-            </textarea>
-
-            <!--
-                next scheduled recording status
-            -->
-
-            <textarea name="scheduled_label" draworder="1" align="center">
-                <font>label</font>
-                <area>20,320,760,30</area>
-                <value></value>
-            </textarea>
-
-            <textarea name="scheduled_text" draworder="1" align="hcenter">
-                <multiline>yes</multiline>
-                <font>biginfo</font>
-                <area>20,400,760,120</area>
-                <value></value>
-            </textarea>
-
-            <textarea name="mythvantage_text" draworder="1" align="right">
-                <multiline>no</multiline>
-                <font>tinyinfo</font>
-                <area>20,560,760,30</area>
-                <value></value>
-            </textarea>
-            <!--
-                scheduled recordings conflict warning
-            -->
-
-            <textarea name="conflicts_text" draworder="1" align="center">
-                <font>warning</font>
-                <area>20,490,760,30</area>
-                <value>WARNING: There are conflicting scheduled recordings!</value>
-            </textarea>
-
-            <!--
-                start frontend button
-
-            <textbutton name="startfrontend_button" draworder="1">
-                <position>81,535</position>
-                <font>buttons</font>
-                <image function="on" filename="mw_text_button_on.png"></image>
-                <image function="off" filename="mw_text_button_off.png"></image>
-                <image function="pushed" filename="mw_text_button_pushed.png"></image>
-            </textbutton>
-
-            -->
-
-	   </container>
-
-    </window>
-
-</mythuitheme>
diff --git a/abs/core-testing/mythinstall/install_proxy.sh b/abs/core-testing/mythinstall/install_proxy.sh
deleted file mode 100755
index a1a722e..0000000
--- a/abs/core-testing/mythinstall/install_proxy.sh
+++ /dev/null
@@ -1,353 +0,0 @@
-#!/bin/bash
-disk=$2
-rootfs=$3
-rootsize=$4
-datafs=$5
-datasize=$6
-swapsize=$7
-mountpoint="/new_boot"
-run=/root/install_functions.sh
-. /etc/systemconfig 2>/dev/null
- 
-
-progress () {
-mypercent=`echo "$1" | cut -d. -f1`
-if [  x$mypercent = x ]
-then
-echo "" > /tmp/.install_percent
-else
-echo "${mypercent}% complete" > /tmp/.install_percent
-fi
-
-
-}
-
-full_install () {
-    if [ -f /tmp/.this_is_upgrade ]
-    then
-        rm /tmp/.this_is_upgrade
-    fi
-    echo "Partitioning $disk" > /tmp/.install_state
-    progress 1
-    sleep 1
-    $run partition_it $disk $rootsize $datasize $swapsize
-
-    echo "Formating $disk" > /tmp/.install_state
-        progress 2
-    sleep 1
-    $run format_it $disk $rootfs $datafs
-
-    echo "Preparing $disk" > /tmp/.install_state
-    progress 3
-    sleep 1
-    $run mount_it $disk
-
-    startsize=`statgrab -M disk.|grep $disk.write_bytes|cut -d= -f 2|tr -d " "`
-
-    echo "STARTSIZE=$startsize">/tmp/.startsize.io
-    echo "Installing data" > /tmp/.install_state
-
-    sleep 1
-        $run copy_it $disk ALL
-        $run fstab_fix_it $disk $rootfs $datafs
-
-    progress 99
-    sleep 1
-    $run grub_it $disk
-
-    echo "Configuring system" > /tmp/.install_state
-        progress 100
-        sleep 1
-        cp -f /etc/systemconfig "$mountpoint"/etc
-    #run save syssettings to save settings, then copy to new mountpoint
-        /root/restore_default_settings.sh  -c save -t syssettings -h myhost -d 127.0.0.1
-        SE=/usr/share/templates/settings/syssettings
-        mkdir -p ${mountpoint}$SE
-        cp -rp $SE/*  ${mountpoint}$SE/
-        chown root:mythtv "$mountpoint"/etc/systemconfig
-        chown -R mythtv:mythtv ${mountpoint}$SE
-
-        chmod -R 775   ${mountpoint}$SE
-        chmod 775 "$mountpoint"/etc/systemconfig
-        #copy over any updates that might have occured
-        cp -f /root/*.sh "$mountpoint"/root/
-        chmod -R 755 ${mountpoint}/root
-        cp /etc/mtab "$mountpoint"/etc/mtab
-        chroot "$mountpoint" /root/systemconfig.sh misc,hostype,network
-
-    if  [ $SystemType = "Master_backend" -o $SystemType = "Standalone"  ]
-    then
-            #installing DB to local machine
-
-            chroot "$mountpoint"   /root/install_db_chroot.sh
-    else
-            #update remotedb with this host settings
-            chroot "$mountpoint" /root/restore_default_settings.sh -c restore -t Default
-            chroot "$mountpoint" /root/restore_default_settings.sh -c restore -t syssettings
-            #Run second time
-            chroot "$mountpoint" /root/systemconfig.sh misc,hostype,network
-    fi
-    echo "Done" > /tmp/.install_state
-    $run unmount_it $disk
-}
-
-
-
-
-function upgrade () {
-    touch /tmp/.this_is_upgrade
-
-    if [ ! x$rootfs = "xDo_not_format" ]
-    then
-        echo "Formating $disk" > /tmp/.install_state
-            progress 2
-            sleep 1
-            $run format_it $disk $rootfs NO
-    fi
-
-
-    echo "Preparing $disk" > /tmp/.install_state
-        progress 3
-        sleep 1
-        $run mount_it $disk
-        startsize=`statgrab -M disk.|grep $disk.write_bytes|cut -d= -f 2|tr -d " "`
-        echo "STARTSIZE=$startsize">/tmp/.startsize.io
-        echo "Installing data" > /tmp/.install_state
-        sleep 1
-        cp -rf /tmp/etc /new_boot/etc.old
-        cp -rf  /tmp/oss /new_boot/var/lib/oss.old
-        $run copy_it $disk bin.lzm,boot.lzm,etc.lzm,home.lzm,lib.lzm,opt.lzm,root.lzm,sbin.lzm,usr.lzm,var.lzm
-
-        if [  x$rootfs = "xDo_not_format" ]
-        then
-            rootfs=`grep ${disk}1 /tmp/etc/fstab |awk ' { print $3 } '`
-        fi
-            datafs=`grep ${disk}3 /tmp/etc/fstab |awk ' { print $3 } '`
-        $run fstab_fix_it $disk $rootfs $datafs
-
-    echo "Writing boot sector" > /tmp/.install_state
-        progress 99
-        sleep 1
-        $run grub_it $disk
-
-
-    echo "Configuring system" > /tmp/.install_state
-        progress
-        sleep 1
-        cp /etc/mtab "$mountpoint"/etc/mtab
-        cp -f /etc/systemconfig "$mountpoint"/etc
-        cp -f /root/*.sh "$mountpoint"/root/
-        chmod -R 755 ${mountpoint}/root
-        chown root:mythtv "$mountpoint"/etc/systemconfig
-        chmod 775 "$mountpoint"/etc/systemconfig
-        chroot "$mountpoint" /root/systemconfig.sh misc,hostype,network
-    #  chroot "$mountpoint" /root/restore_default_settings.sh restore Default
-        chroot "$mountpoint" /root/restore_default_settings.sh -c restore -t syssettings
-    #Run second time
-        chroot "$mountpoint" /root/systemconfig.sh misc,hostype,network
-    #  fi
-
-    echo "Done" > /tmp/.install_state
-
-    $run unmount_it $disk
-}
-
-
-
-function killdhcp () {
-if [ -f /etc/dhcpc/dhcpcd-eth0.pid ]
-        then
-            pid=`cat /etc/dhcpc/dhcpcd-eth0.pid`
-            kill -9 $pid
-            rm -f /etc/dhcpc/dhcpcd-eth0.pid
-            rm -f /var/run/dhcpcd*
-        fi
-if [ -f /var/run/dhcpcd-eth0.pid ]
-        then
-            pid=`cat /var/rundhcpcd-eth0.pid`
-            kill -9 $pid
-            rm -f /var/run/dhcpcd-eth0.pid*
-        fi
-ip address flush dev eth0
-}
-
-function network_setup () {
-DEVICE=eth0
-    if [ ! -f /etc/systemconfig ]
-    then
-        exit 1
-    fi
-killdhcp
-
-if [ $UseDHCP = 0 ]
-then
-        /sbin/dhcpcd $DEVICE
-        if [ ! $? = 0 ]
-        then
-            exit 2
-        fi
-fi
-
-if [ $UseDHCP = 1 ]
-then
-
-        /sbin/ifconfig $DEVICE $ip
-        /sbin/route add default gw $route
-        echo "nameserver $nameserver" > /etc/resolv.conf
-fi
-
-
-}
-
-function SANE_SYSETTINGS () {
-sed -e '/HOSTrootfstype/d' \
-        -e '/HOSTrootfstype/d' \
-        -e '/HOSTdatafstype/d' \
-        -e '/HOSTOSsize/d'  \
-        -e '/HostUseALLdata/d'  \
-        -e '/HOSTDATAsize/d'    \
-        -e '/HOSTuprootfstype/d'    \
-        -e '/HostUseSWAP/d' \
-        -e '/HOSTSWAPsize/d  ' /tmp/usr/share/templates/settings/syssettings/settings.txt  >  /tmp/settings.new
-    mv  /tmp/settings.new /tmp/usr/share/templates/settings/syssettings/settings.txt
-}
-
-case $1 in
-        full_install_it )
-
-            full_install
-        ;;
-        find_update)
-            #TRY TO mount first partition of drive
-            #copy /etc/systemconfig to live,  import settings into db
-            #umount drive
-            $run mount_it $disk
-                if [ -f /new_boot/etc/systemconfig ]
-                then
-                ###########ADD templates
-                mkdir -p /tmp/usr/share/templates
-                cp -pr /new_boot/usr/share/templates  /tmp/usr/share
-                SANE_SYSETTINGS
-                cp -rp /tmp/usr/share/templates/settings /usr/share/templates
-
-
-                cp /new_boot/etc/systemconfig /etc/systemconfig
-                cp -rf  /new_boot/etc /tmp/etc
-                cp -rf /new_boot/var/lib/oss  /tmp/oss
-
-                /root/restore_default_settings.sh -c restore -t syssettings -h myhost  -d 127.0.0.1
-                fi
-            $run umount_it $disk
-            ;;
-
-        upgrade_it)
-                #"/root/install_proxy.sh upgrade_it " + install_drive + " " + rootfs +  "&"
-                upgrade
-
-            ;;
-        disk_model_it)
-                        model="unknown"
-                            size="xxx"
-                        case $2 in
-
-                            h* )
-                                    model=`cat /proc/ide/$2/model`
-                                    ;;
-                            s*)     model=`sginfo /dev/$2|grep Product|awk ' { print $2 } '`
-                                    ;;
-                        esac
-                                size=`parted /dev/$2  print |grep Disk|awk  ' { print $3 } '  `
-
-
-                                echo ""$model" $size " >/tmp/model
-
-            ;;
-        network_check_it)
-                        #Should never return from check_network
-                        case $2 in
-                                setup_network)  network_setup
-                                ;;
-
-                                check_self)
-                                            myipeth0=`ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'|head -n1`
-                                            ping -c 1 $myipeth0
-                                                    if [ ! $? = 0 ]
-                                                    then
-                                                        exit 3
-                                                        #can't ping yourself
-                                                    fi
-                                ;;
-                                check_gw)
-                                            #check gateway
-                                            mygweth0=`/sbin/route |grep eth0|grep UG|awk '{ print $2}'`
-                                            ping -c 1 $mygweth0
-                                            if [ ! $? = 0 ]
-                                            then
-                                                exit 4
-                                                #can't ping the gw
-                                            fi
-                                ;;
-                                check_ns)
-                                            #check nameserver
-                                                    mydns=`cat /etc/resolv.conf|grep nameserver|head -1|awk '{ print $2}'`
-                                                    ping -c 1 $mydns
-                                                    if [ ! $? = 0 ]
-                                                    then
-                                                        exit 5
-                                                        #can't ping the gw
-                                                    fi
-                                ;;
-                                check_names)
-                                            host google.com
-                                            if [ ! $? = 0 ]
-                                            then
-                                                exit 6
-                                                #can't ping the gw
-                                            fi
-                                ;;
-                            esac
-                        exit 0
-            ;;
-
-
-        * )
-            state=`cat /tmp/.install_state`
-            if  [  x"${state}" =  "xConfiguring system" ]
-            then
-                progress ""
-            else
-        #finding the drive
-                ddrive=`df |  grep $mountpoint | head -n1 | awk -F/ ' { print $3 } ' | cut -d" " -f 1|cut -b1,2,3 `
-                used=`statgrab -M disk.|grep ${ddrive}.write_bytes|cut -d= -f 2|tr -d " "`
-        . /tmp/.startsize.io
-        used=`echo $used-$STARTSIZE|bc`
-        echo $used
-
-        if [ ! x$used = x ]
-            then
-                . /root/.install_size
-                #somehow find if it's an install or update
-                if [ -f /tmp/.this_is_upgrade ]
-                then
-                    total=$UPGRADESIZE
-                else
-                    total=$TOTALSIZE
-                fi
-            percent=`echo "scale=2 ;  ($used/$total) * 100 " |bc `
-            cond2=$(echo "$percent > 100" |bc  )
-            if [ $cond2 -eq 1  ]
-            then
-            percent=100
-            fi
-            cond3=$(echo "$percent < 3" |bc )
-            if [ $cond3 -eq 0   ]
-                then
-                    progress $percent
-                fi
-            fi
-        fi
-        ;;
-esac
-
-
-
diff --git a/abs/core-testing/mythinstall/installationtype.cpp b/abs/core-testing/mythinstall/installationtype.cpp
deleted file mode 100755
index d32b9fc..0000000
--- a/abs/core-testing/mythinstall/installationtype.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-#include <mythcontext.h>
-#include <unistd.h>
-#include <iostream>
-#include <fstream>
-#include <stdio.h>
-#include "settings.h"
-#include "installsettings.h"
-#include "installdialog.h"
-#include "installationtype.h"
-#include <qsqldatabase.h>
-#include <qsqlquery.h>
-#include <qdir.h>
-#include <mythtv/mythdbcon.h>
-#include "mv_common.h"
-
-int mythinstalltype (QString  tmp_install_drive)
-{
-
-    Mythinstalltype setting;
-       setting.load();
-       setting.save();
-    //setting.exec();
-        int retc = 1 ;
-        if ( setting.exec() == QDialog::Accepted )
-        {
-        retc = 0;
-        }
-    return retc;
-
-};
-
- static HostComboBox *HOSTinstallationtype()
-{
-    HostComboBox *gc = new HostComboBox("HOSTinstallationtype");
-    gc->setLabel(QObject::tr("Upgrade or Full install"));
-    gc->addSelection("Full/Auto") ;
-    gc->addSelection("Upgrade");
-
-
-    gc->setHelpText(QObject::tr("A full install will erase the entire drive and repartition.  An upgrade will only format or overlay the first parition of the drive."));
-
-    return gc;
-}
-
-static HostSpinBox *HOSTOSsize()
-{
-    #ifdef __MVAPP__
-        HostSpinBox *gc = new HostSpinBox("HOSTOSsize", 2, 15, 1, true);
-    #else
-        HostSpinBox *gc = new HostSpinBox("HOSTOSsize", 3, 25, 1, true);
-    #endif
-    gc->setLabel(QObject::tr("OS size (GB)"));
-    gc->setValue(2);
-    gc->setHelpText(QObject::tr(""  ));
-
-    return gc;
-}
-static HostSpinBox *HOSTDATAsize()
-{
-    HostSpinBox *gc = new HostSpinBox("HOSTDATAsize", 2, 1500, 1, true);
-    gc->setLabel(QObject::tr("Data size (GB)"));
-    gc->setValue(2);
-    gc->setHelpText(QObject::tr(""  ));
-
-    return gc;
-}
-
-static HostSpinBox *HOSTSWAPsize()
-{
-    QString currentitem;
-    QString line;
-    QFile file("/proc/meminfo");
-        if ( file.open(IO_ReadOnly | IO_Translate) )
-        {
-        QTextStream t( &file );        // use a text stream
-            line = t.readLine();
-             if ( line.startsWith("MemTotal:"))
-                {
-                currentitem = line.simplifyWhiteSpace();
-                currentitem = currentitem.section( " ", 1, 1 );
-                }
-         }
-         file.close();
-    bool ok;
-    int mem = currentitem.toInt( &ok, 10 );     // dec == 0, ok == FALSE
-    mem = mem/1024 ;
-    if ( !  ok )
-         mem = 120 ;
-    HostSpinBox *gc = new HostSpinBox("HOSTSWAPsize", 128, 128000, 128, true);
-    gc->setLabel(QObject::tr("Swapspace size (MB)"));
-    gc->setValue(mem);
-    gc->setHelpText(QObject::tr(""  ));
-
-    return gc;
-}
-
-static HostCheckBox *HostUseSWAP()
-{
-    HostCheckBox *gc = new HostCheckBox("HostUseSWAP");
-    gc->setLabel(QObject::tr("Use swap partition"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("Enable or disable the swap partition."));
-    return gc;
-};
-
-static HostCheckBox *HostUseALLdata()
-{
-    HostCheckBox *gc = new HostCheckBox("HostUseALLdata");
-    gc->setLabel(QObject::tr("Use all remaining space for data"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("If checked myth will use the rest of the drive for the data.  Otherwise you will be able to set the size of the partition."));
-    return gc;
-};
-
-
-static HostComboBox *HOSTdatafstype()
-{
-    HostComboBox *gc = new HostComboBox("HOSTdatafstype");
-    gc->setLabel(QObject::tr("Data filesystem"));
-    gc->addSelection("ext3") ;
-    gc->addSelection("ext4") ;
-    gc->addSelection("reiserfs");
-    gc->addSelection("jfs");
-    gc->addSelection("xfs");
-
-    gc->setHelpText(QObject::tr("Filesystem for data. "));
-
-    return gc;
-}
-
- static HostComboBox *HOSTuprootfstype()
-{
-    HostComboBox *gc = new HostComboBox("HOSTuprootfstype");
-    gc->setLabel(QObject::tr("OS file system"));
-    gc->addSelection("ext3") ;
-    gc->addSelection("ext4") ;
-    gc->addSelection("reiserfs");
-    gc->addSelection("jfs");
-    //gc->addSelection("xfs");
-    gc->addSelection("Do_not_format");
-
-    gc->setHelpText(QObject::tr("Filesystem for OS. "));
-
-    return gc;
-}
-
-static HostComboBox *HOSTrootfstype()
-{
-    HostComboBox *gc = new HostComboBox("HOSTrootfstype");
-    gc->setLabel(QObject::tr("Root filesystem format"));
-    gc->addSelection("ext3") ;
-    gc->addSelection("ext4") ;
-    gc->addSelection("reiserfs");
-    gc->addSelection("jfs");
-    //gc->addSelection("xfs");
-
-    gc->setHelpText(QObject::tr("Filesystem for OS.  "));
-
-    return gc;
-}
-
-class USESwap:
-                       public TriggeredConfigurationGroup {
-public:
-    USESwap():
-         //ConfigurationGroup(false, true, false, false),
-         //VerticalConfigurationGroup(false, true, false, false),
-         TriggeredConfigurationGroup(true,false,true,true,false,false,false,true) {
-         //setLabel(QObject::tr("" ));
-//         setUseLabel(false);
-
-
-        Setting* useswap = HostUseSWAP();
-         addChild(useswap);
-         setTrigger(useswap);
-
-
-         ConfigurationGroup* swapyes = new VerticalConfigurationGroup(false);
-             swapyes->addChild(HOSTSWAPsize());
-
-
-
-             addTarget("1", swapyes );
-         addTarget("0",  new VerticalConfigurationGroup(true));
-
-
-
-
-     };
-};
-
-class DATAsize:
-                       public TriggeredConfigurationGroup {
-public:
-    DATAsize():
-         //ConfigurationGroup(false, true, false, false),
-         //VerticalConfigurationGroup(false, true, false, false),
-         TriggeredConfigurationGroup(true,false,true,true,false,false,false,true) {
-         //setLabel(QObject::tr("" ));
-//         setUseLabel(false);
-
-
-        Setting* datasize = HostUseALLdata();
-         addChild(datasize);
-         setTrigger(datasize);
-
-
-         ConfigurationGroup* alldatano = new VerticalConfigurationGroup(false);
-         alldatano->addChild(HOSTDATAsize());
-	     alldatano->addChild(HOSTdatafstype());
-
-         ConfigurationGroup* alldatayes = new VerticalConfigurationGroup(false);
-             alldatayes->addChild(HOSTdatafstype());
-
-
-
-
-         addTarget("1", alldatayes);
-         addTarget("0", alldatano);
-
-
-
-     };
-};
-
-
-class Installationtype:
-                       public TriggeredConfigurationGroup {
-public:
-    Installationtype():
-         //ConfigurationGroup(false, true, false, false),
-         //VerticalConfigurationGroup(false, true, false, false),
-         TriggeredConfigurationGroup(true,false,true,true,false,false,false,true) {
-//         setLabel(QObject::tr("Upgrade or Full install" ));
-//         setUseLabel(false);
-
-
-        Setting* Mtemplate = HOSTinstallationtype();
-         addChild(Mtemplate);
-         setTrigger(Mtemplate);
-
-
-         ConfigurationGroup* tupgrade = new VerticalConfigurationGroup(false);
-             tupgrade->addChild(HOSTuprootfstype());
-
-  	 ConfigurationGroup* tfull = new VerticalConfigurationGroup(false);
-             tfull->addChild(HOSTOSsize());
-             tfull->addChild(HOSTrootfstype());
-             tfull->addChild(new USESwap);
-             tfull->addChild(new DATAsize);
-
-
-
-         addTarget("Upgrade",tupgrade );
-	     addTarget("Full/Auto", tfull);
-
-
-     };
-};
-
-Mythinstalltype::Mythinstalltype()
-{
-    //Reseting the install type to remove "NET"
-    if ( gContext->GetSetting("Hostinstallationtype")  == "NET")
-            gContext ->SaveSetting("HOSTinstallationtype","Full/Auto");
-        Installationtype *installationtype = new Installationtype();
-        addChild(installationtype);
-
-}
-
-
-
diff --git a/abs/core-testing/mythinstall/installationtype.h b/abs/core-testing/mythinstall/installationtype.h
deleted file mode 100755
index ad29224..0000000
--- a/abs/core-testing/mythinstall/installationtype.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <settings.h>
-#include "mythdialogs.h"
-//###################################################################################################3
-class Mythinstalltype: public ConfigurationWizard {
-public:
-    Mythinstalltype();
-
-};
-
-int mythinstalltype(QString);
-
diff --git a/abs/core-testing/mythinstall/installdialog.cpp b/abs/core-testing/mythinstall/installdialog.cpp
deleted file mode 100755
index e5bdfc9..0000000
--- a/abs/core-testing/mythinstall/installdialog.cpp
+++ /dev/null
@@ -1,1034 +0,0 @@
-#include <qapplication.h>
-#include <unistd.h>
-#include <fstream>
-#include <sys/wait.h>   // For WIFEXITED on Mac OS X
-
-#include "mythcontext.h"
-#include "mythdbcon.h"
-#include "lcddevice.h"
-#include "tv.h"
-#include "programinfo.h"
-#include "uitypes.h"
-#include "remoteutil.h"
-#include <qdir.h>
-#include "installdialog.h"
-#include "installsettings.h"
-#include "installationtype.h"
-#include "mv_common.h"
-#include "libmyth/dialogbox.h"
-#include <stdlib.h>
-#define UPDATE_STATUS_INTERVAL   5000
-#define UPDATE_SCREEN_INTERVAL   5000
-
-
-
-WelcomeDialog::WelcomeDialog(MythMainWindow *parent,
-                            QString window_name,
-                            QString theme_filename,
-                            const char* name)
-:MythThemedDialog(parent, window_name, theme_filename, name)
-{
-    system("rm -f /tmp/.install_state");
-    system("rm -f /tmp/.install_percent");
-    system("rm -f /tmp/.install_error");
-    install_drive = "" ;
-    recording_text = "";
-    scheduled_text = "";
-    install_text =  "";
-    version_text = "";
-    I_AM_BUSY = false;
-    WORKING_ON_INSTALL = false;
-    current_hostname = "";
-
-    gContext->addListener(this);
-    m_timeFormat = gContext->GetSetting("TimeFormat", "h:mm AP");
-    wireUpTheme();
-    assignFirstFocus();
-
-    m_updateStatusTimer = new QTimer(this);
-    connect(m_updateStatusTimer, SIGNAL(timeout()), this,
-            SLOT(updateStatus()));
-    m_updateStatusTimer->start(UPDATE_STATUS_INTERVAL);
-
-    m_updateScreenTimer = new QTimer(this);
-    connect(m_updateScreenTimer, SIGNAL(timeout()), this,
-            SLOT(updateScreen()));
-
-    m_timeTimer = new QTimer(this);
-    connect(m_timeTimer, SIGNAL(timeout()), this,
-            SLOT(updateTime()));
-    m_timeTimer->start(1000);
-
-    reboot_box = NULL;
-    popup = NULL;
-    showPopup();
-}
-void WelcomeDialog::shutdownNow(int rc)
-{
-    QString NETBOOT = getenv("NETBOOT");
-    NETBOOT=NETBOOT.stripWhiteSpace();
-    system("rm -f /tmp/.install_state");
-    system("rm -f /tmp/.install_percent");
-    system("rm -f /tmp/.install_error");
-    if (rc == 1)
-        system("/sbin/halt");
-    else
-        system("/sbin/reboot");
- //   system("/usr/bin/killall -9 X");
-}
-
-void WelcomeDialog::runLIVECD(void)
-{
-    cancelPopup();
-    ask_validate_network();
-    if ( runsettings(true) ==  1  )
-    {
-        QString PAINTER = gContext->GetSetting("ThemePainter");
-        QString startFECmd = ("MYTHCONFDIR=/tmp  mythfrontend -O ThemePainter=" + PAINTER   );
-        myth_system(startFECmd.ascii());
-    }
-    else
-    {
-        cancelPopup();
-        showPopup();
-    }
-
-
-}
-
-
-
-int WelcomeDialog::exec()
-{
-    updateAll();
-    return MythDialog::exec();
-}
-
-
-
-void WelcomeDialog::keyPressEvent(QKeyEvent *e)
-{
-    bool handled = false;
-    QStringList actions;
-    gContext->GetMainWindow()->TranslateKeyPress("Welcome", e, actions);
-    for (unsigned int i = 0; i < actions.size() && !handled; i++)
-    {
-        QString action = actions[i];
-        handled = true;
-        if (action == "ESCAPE")
-        {
-            return; // eat escape key
-        }
-        else if (action == "MENU")
-        {
-            showPopup();
-        }
-        else if (action == "NEXTVIEW")
-        {
-            accept();
-        }
-        else if (action == "SELECT")
-        {
-            activateCurrent();
-        }
-        else
-            handled = false;
-    }
-
-    if (!handled)
-        MythThemedDialog::keyPressEvent(e);
-}
-
-UITextType* WelcomeDialog::getTextType(QString name)
-{
-    UITextType* type = getUITextType(name);
-    if (!type)
-    {
-        cout << "ERROR: Failed to find '" << name <<  "' UI element in theme file\n"
-            << "Bailing out!" << endl;
-        exit(0);
-    }
-    return type;
-}
-
-void WelcomeDialog::wireUpTheme()
-{
-    m_status_text = getTextType("status_text");
-    m_recording_text = getTextType("recording_text");
-    m_scheduled_text = getTextType("scheduled_text");
-    m_mv_text=getTextType("mythvantage_text");
-    m_time_text = getTextType("time_text");
-    m_date_text = getTextType("date_text");
-    m_warning_text = getTextType("conflicts_text");
-    m_warning_text->hide();
-    buildFocusList();
-}
-
-void WelcomeDialog::closeDialog()
-{
-    done(1);
-}
-
-WelcomeDialog::~WelcomeDialog()
-{
-    gContext->removeListener(this);
-    if (m_updateStatusTimer)
-        delete m_updateStatusTimer;
-
-    if (m_updateScreenTimer)
-        delete m_updateScreenTimer;
-
-    if (m_timeTimer)
-        delete m_timeTimer;
-}
-
-void WelcomeDialog::updateTime(void)
-{
-    QString releasefile="/etc/";
-    releasefile.append(RELEASEFILE);
-
-    extern const char *myth_source_version;
-    extern const char *myth_source_path;
-    QString distro_line;
-    QFile file(releasefile);
-        if ( file.open(IO_ReadOnly | IO_Translate) )
-        {
-            QTextStream t( &file );        // use a text stream
-            distro_line = t.readLine();
-            file.close();
-        }
-
-
-    QString s="";
-    //QString s="MythVantage 1.4 Mythtv svn: ";
-    s.append(distro_line);
-    s.append( " , Mythtv svn:" );
-    s.append(myth_source_version);
-    s.append("  ");
-    s.append(myth_source_path);
-    m_date_text->SetText(s);
-}
-
-void WelcomeDialog::updateStatus(void)
-{
-//   checkConnectionToServer();
-    updateStatusMessage();
-}
-
-void WelcomeDialog::updateScreen(void)
-{
-    QString cmdtxt;
-    cmdtxt=MV_ROOT  ;
-    cmdtxt.append("bin/install_proxy.sh " );
-    system(cmdtxt);
-    recording_text=" ";
-    mythvantage_text=" ";
-    error_text=" ";
-    scheduled_text=" ";
-    QFile mystatus("/tmp/.install_state");
-    QFile mypercent("/tmp/.install_percent");
-    QFile myerror("/tmp/.install_error");
-    QFile mylog("/tmp/mythvantage_install.log");
-    if ( mystatus.open(IO_ReadOnly | IO_Translate) )
-        {
-            QTextStream t( &mystatus );        // use a text stream
-            scheduled_text = t.readLine();
-            mystatus.close();
-        }
-
-        if ( mypercent.open(IO_ReadOnly | IO_Translate) )
-        {
-            QTextStream t( &mypercent );        // use a text stream
-            recording_text = t.readLine();
-            mypercent.close();
-        }
-
-        if ( myerror.open(IO_ReadOnly | IO_Translate) )
-        {
-            QTextStream t( &myerror );        // use a text stream
-            error_text = t.readLine();
-            myerror.close();
-            scheduled_text = error_text;
-            recording_text = "FAILED";
-            WORKING_ON_INSTALL = false;
-        }
-
-    if ( WORKING_ON_INSTALL )
-    {
-        if ( mylog.open( IO_ReadOnly| IO_Translate ) )
-            {
-                QTextStream t( &mylog );
-                while ( !t.atEnd() )
-                {
-                    mythvantage_text=t.readLine();
-                }
-                mylog.close();
-            }
-    }
-    else
-    mythvantage_text="";
-    m_recording_text->SetText(recording_text);
-    m_scheduled_text->SetText(scheduled_text);
-    m_mv_text->SetText(mythvantage_text);
-
-    if ( install_drive != ""  )
-        install_text = "";
-
-    m_status_text->SetText(install_text );
-    m_updateScreenTimer->start(UPDATE_SCREEN_INTERVAL, true);
-    if ( scheduled_text == "Done" )
-    {
-        Reboot_popup () ;
-    }
-    // shows the busy box when configuring the system
-    if ( scheduled_text == "Configuring system")
-    {
-        if  ( ! I_AM_BUSY )
-        busy_box();
-        assignFirstFocus();
-    }
-};
-
-void WelcomeDialog::busy_box(void)
-{
-    QString msgtext = "Please wait, " ;
-    msgtext.append(current_hostname);
-    msgtext.append(" is preparing for life");
-    MythBusyDialog *busy = new MythBusyDialog(msgtext);
-    busy->start();
-
-    while (  scheduled_text == "Configuring system" )
-    {
-        qApp->processEvents ();
-        usleep(900);
-        I_AM_BUSY = true;
-    }
-    busy->Close();
-    I_AM_BUSY = false;
-    busy->deleteLater();
-}
-
-void WelcomeDialog::busy_find_oldsettings(void)
-{
-    MythBusyDialog *busy = new MythBusyDialog(
-                                            QObject::tr("Importing old settings"));
-    busy->start();
-    int return_code = 0;
-    while (  return_code  == 0 )
-    {
-        qApp->processEvents ();
-        usleep(900);
-        I_AM_BUSY = true;
-        return_code = myth_system("ps -ef|grep install_proxy.sh|grep -v grep > /dev/null");
-
-    }
-    busy->Close();
-    I_AM_BUSY = false;
-    busy->deleteLater();
-
-}
-
-
-
-void WelcomeDialog::updateAll(void)
-{
-    updateRecordingList();
-    updateScheduledList();
-}
-
-bool WelcomeDialog::updateRecordingList()
-{
-    return true;
-}
-
-bool WelcomeDialog::updateScheduledList()
-{
-    updateStatus();
-    updateScreen();
-    return true;
-}
-
-void WelcomeDialog::updateStatusMessage(void)
-{
-
-}
-
-void WelcomeDialog::showPopup(void)
-{
-    if (popup)
-        return;
-    popup = new MythPopupBox(gContext->GetMainWindow(), "Menu");
-    QButton *topButton;
-    QLabel *label = popup->addLabel(tr("Menu"), MythPopupBox::Large, false);
-    label->setAlignment(Qt::AlignCenter | Qt::WordBreak);
-    // This is a bad way to lock the buttons but it works for now.
-    if ( scheduled_text.length() <= 2  )
-    {
-        topButton = popup->addButton(tr("Install or Upgrade "), this,
-                                SLOT(Display_2ndpopup()));
-        popup->addButton(tr("Run MythFrontend"), this,
-                        SLOT(runLIVECD()));
-        popup->addButton(tr("Exit"), this,
-                    SLOT(closeDialog()));
-        popup->addButton(tr("Close menu"), this, SLOT(cancelPopup()));
-
-        popup->ShowPopup(this, SLOT(cancelPopup()));
-
-    }
-    else
-    {
-        topButton= popup->addButton(tr("Exit"), this,
-                        SLOT(closeDialog()));
-        popup->addButton(tr("Close menu"), this, SLOT(cancelPopup()));
-
-        popup->ShowPopup(this, SLOT(cancelPopup()));
-    }
-
-    topButton->setFocus();
-}
-
-
-QString WelcomeDialog::diskmodel(QString drive ,  QString tsize)
-{
-    string line;
-    QString cmdtxt;
-    cmdtxt=MV_ROOT  ;
-    cmdtxt.append("bin/install_proxy.sh disk_model_it " +  drive + " " + tsize );
-    myth_system(cmdtxt);
-
-    ifstream model("/tmp/model");
-    if (model.is_open())
-            getline (model,line);
-    model.close();
-    return line;
-}
-
-QString WelcomeDialog::findinstallsouce(void)
-{
-    string line;
-    QString currentitem;
-    ifstream  mountfile("/proc/mounts");
-    //ifstream  mountfile("procmounts");
-    while (! mountfile.eof() )
-        {
-            getline (mountfile,line);
-            if ( line.empty() )
-                line = "oops didn't find andthing";
-            currentitem = line;
-
-            if ( ! currentitem.contains("/dev"))
-                currentitem="not the right line";
-
-            //if  ( currentitem.contains("/mnt/live/mnt") )
-            if  ( currentitem.contains("/.livesys/medium") )
-                {
-                    int ndx = line.find(" ");
-                        currentitem = line.substr(0,ndx);
-                        ndx = currentitem.findRev("/");
-                        currentitem = currentitem.mid(ndx+1,3);
-                    return currentitem;
-                };
-
-        }
-
-};
-
-void WelcomeDialog::showPopup_2(void)
-{
-
-    if (popup)
-        return;
-    popup = new MythPopupBox(gContext->GetMainWindow(), "Select the drive to install");
-    findinstallsouce();
-    QButton *CancelButton;
-    QLabel *label = popup->addLabel(tr("Select the install target."), MythPopupBox::Large, false);
-    label->setAlignment(Qt::AlignCenter | Qt::WordBreak);
-    string  currentitem;
-    string  sizeitem;
-    string disksize;
-    string line;
-    bool installsource = false;
-
-    QString NETBOOT = getenv("NETBOOT");
-    NETBOOT=NETBOOT.stripWhiteSpace();
-    if ( NETBOOT   == "YES" )
-        popup->addButton(("Diskless Frontend " ), this, SLOT(install_net() ) );
-
-    QString  INSTALLSOURCE = findinstallsouce();
-     std::cout << "install source:" << std::endl;
-     std::cout << INSTALLSOURCE << std::endl;
-    ifstream partitions("/proc/partitions");
-    if (partitions.is_open())
-        while (! partitions.eof() )
-        {
-            getline (partitions,line);
-            if ( line.empty() )
-            {
-                line = "oops didn't find anything";
-            }
-            int ndx = line.rfind(" ");
-            ndx = ndx +1;
-            int linelength = line.length();
-            currentitem = line.substr(ndx,linelength);
-            sizeitem = line.substr(0,ndx-1);
-            linelength = sizeitem.length();
-            ndx  = sizeitem.rfind(" ");
-            disksize = sizeitem.substr(ndx+1,linelength);
-
-//              std::cout << currentitem<< std::endl;
-            if(  currentitem == INSTALLSOURCE  )
-            {
-                std::cout << currentitem<< std::endl;
-                installsource = true;
-            }
-
-
-            if (! installsource  )
-                {
-                if ( currentitem == "hda" )
-                    popup->addButton(("hda  " + diskmodel(currentitem,disksize)), this, SLOT(install_hda() ) );
-                if ( currentitem == "hdb" )
-                    popup->addButton(("hdb  " + diskmodel(currentitem,disksize)), this, SLOT(install_hdb() ) );
-                if ( currentitem == "hdc" )
-                    popup->addButton(("hdc  " + diskmodel(currentitem,disksize)), this, SLOT(install_hdc() ) );
-                if ( currentitem == "hdd" )
-                    popup->addButton(("hdd  " + diskmodel(currentitem,disksize)), this, SLOT(install_hdd() ) );
-                if (currentitem == "sda" )
-                    popup->addButton(("sda  " + diskmodel(currentitem,disksize)), this, SLOT(install_sda() ) );
-                if (currentitem == "sdb" )
-                    popup->addButton(("sdb  " + diskmodel(currentitem,disksize)), this, SLOT(install_sdb() ) );
-                if (currentitem == "sdc" )
-                    popup->addButton(("sdc  "+ diskmodel(currentitem,disksize)), this, SLOT(install_sdc() ) );
-                if (currentitem == "sdd" )
-                    popup->addButton(("sdd  "+ diskmodel(currentitem,disksize)), this, SLOT(install_sdd() ) );
-                }
-            installsource = false;
-        }
-    partitions.close();
-    CancelButton = popup->addButton(tr("Cancel"), this, SLOT(MAINPopup()));
-    popup->ShowPopup(this, SLOT(cancelPopup()));
-    CancelButton->setFocus();
-}
-
-void WelcomeDialog::GO_popup(QString go_text)
-{
-    if (popup)
-        return;
-    DialogCode  retval = MythPopupBox::Show2ButtonPopup(gContext->GetMainWindow(),
-                                QString("Start the process"),
-                                QObject::tr(go_text),
-                                QObject::tr("Start the process"), QObject::tr("Cancel"), kDialogCodeButton0);
-
-    if ( retval  == kDialogCodeButton0  )
-        {
-            install_it();
-        }
-        else
-        {
-            cancelPopup();
-            showPopup();
-        }
-}
-
-
-void WelcomeDialog::Reboot_popup(void)
-{    if (reboot_box)
-        return;
-    QString prompt1;
-    QFile updbstatus("/tmp/.upgrade_db_failed");
-    if ( updbstatus.open(IO_ReadOnly | IO_Translate) )
-    {
-        prompt1 = QObject::tr(" ");
-        prompt1.append("\n");
-        prompt1.append("An error occured while attempting to restore the database!");
-        prompt1.append("\n");
-        prompt1.append("The old database could not be restored, so a new database was created");
-        prompt1.append("\n");
-
-    }
-    else
-    {
-        prompt1 = QObject::tr("Ready to go!");
-    }
-
-
-
-    reboot_box = new DialogBox(gContext->GetMainWindow(),  prompt1);
-    reboot_box->AddButton(QObject::tr("Reboot"));
-    reboot_box->AddButton(QObject::tr("Power off"));
-
-    int returncode = 0;
-    DialogCode  dcode = reboot_box->exec();
-    reboot_box->deleteLater();
-            if (kDialogCodeButton0 ==  dcode )
-                returncode = 0;
-            if (kDialogCodeButton1 == dcode )
-                returncode = 1;
-            if (kDialogCodeButton2 == dcode )
-                returncode = 2;
-
-
-    reboot_box = NULL;
-    shutdownNow(returncode);
-}
-
-
-
-void WelcomeDialog::cancelPopup(void)
-{
-    if (!popup)
-        return;
-    popup->hide();
-    popup->deleteLater();
-    popup = NULL;
-    setActiveWindow();
-}
-
-void WelcomeDialog::MAINPopup(void)
-{
-    if (!popup)
-        return;
-    popup->hide();
-    popup->deleteLater();
-    popup = NULL;
-    showPopup();
-    setActiveWindow();
-}
-
-void WelcomeDialog::Display_2ndpopup(void)
-{
-    cancelPopup();
-    showPopup_2();
-    updateStatusMessage();
-    updateScreen();
-}
-
-void WelcomeDialog::install_hda(void)
-{
-    install_drive = "hda" ;
-    install_generic();
-}
-
-void WelcomeDialog::install_hdb(void)
-{
-    install_drive = "hdb" ;
-    install_generic();
-}
-
-void WelcomeDialog::install_hdc(void)
-{
-    install_drive = "hdc" ;
-    install_generic();
-}
-
-void WelcomeDialog::install_hdd(void)
-{
-    install_drive = "hdd" ;
-    install_generic();
-}
-
-void WelcomeDialog::install_sda(void)
-{  install_drive = "sda" ;
-    install_generic();
-}
-void WelcomeDialog::install_sdb(void)
-{  install_drive = "sdb" ;
-    install_generic();
-}
-
-void WelcomeDialog::install_sdc(void)
-{  install_drive = "sdc" ;
-    install_generic();
-}
-
-void WelcomeDialog::install_sdd(void)
-{
-    install_drive = "sdd" ;
-    install_generic();
-}
-
-void WelcomeDialog::install_net(void)
-{
-    install_drive = "NET" ;
-    gContext->ActivateSettingsCache(false);
-    gContext ->SaveSetting("HOSTinstallationtype","NET");
-    install_generic();
-}
-
-void WelcomeDialog::install_generic(void)
-{
-    gContext->ActivateSettingsCache(false);
-    cancelPopup();
-    updateStatusMessage();
-    updateScreen();
-    QString installwarningtext;
-    int runNextSetting;
-    runNextSetting = 1;
-    int tflag;
-    tflag = 0;
-    int retcode;
-    retcode=0;
-    QString installtype;
-    if ( install_drive != "NET")
-        retcode = mythinstalltype(install_drive);
-    if ( retcode == 0 )
-    {
-        installtype = gContext -> GetSetting("HOSTinstallationtype");
-            if ( installtype == "Full/Auto" )
-            {
-                runNextSetting = ask_validate_network();
-                installwarningtext="Warning!";
-                installwarningtext.append ("\n");
-                installwarningtext.append ("\n");
-                installwarningtext.append  ("About to erase the entire");
-                installwarningtext.append ("\n");
-                installwarningtext.append  ("installation drive of ");
-                installwarningtext.append (install_drive);
-
-            }
-            else if ( installtype == "NET")
-            {
-                runNextSetting=0;
-                gContext ->SaveSetting("HostSystemType", "Frontend_only");
-                gContext->SaveSetting("HostaccesshostypeSystemtype","0");
-                installwarningtext.append  ("About to install ");
-                installwarningtext.append ("\n");
-                installwarningtext.append (install_drive);
-                // ask for hostname
-                runsettings(false,true,false,false,false,false,false);
-            }
-            else if ( installtype == "Upgrade" )
-            {
-                installwarningtext="Warning!";
-                installwarningtext.append ("\n");
-                installwarningtext.append ("\n");
-                installwarningtext.append  ("About to erase the");
-                installwarningtext.append ("\n");
-                installwarningtext.append  ("partition ");
-                installwarningtext.append (install_drive);
-                installwarningtext.append  ("1");
-                QString cmdtxt;
-                cmdtxt=MV_ROOT  ;
-                cmdtxt.append("bin/install_proxy.sh find_update " +  install_drive +" &");
-                system(cmdtxt);
-                busy_find_oldsettings();
-                bool flag = false;
-                QString line;
-                QString currentitem;
-                QFile file("/etc/systemconfig");
-                if ( file.open(IO_ReadOnly | IO_Translate) )
-                {
-                    QTextStream t( &file );        // use a text stream
-                    while ( !t.eof() )
-                    {
-                        line = t.readLine();
-                        if ( line.startsWith("hostname"))
-                        {
-                            flag=true;
-                            currentitem = line.section( "=", 1, 1 );
-                            current_hostname =  currentitem   ;
-                        }
-                    }
-                    file.close();
-                    cout << current_hostname << endl;
-                }
-                if ( flag )
-                {
-                    //  GO_popup(installwarningtext);
-                        tflag =  1;
-                }
-                else
-                {
-                    cout << "searching for knoppmyth-versin" << endl;
-                    //couldn't open /etc/systemconfig, so now look for /tmp/etc/Knoppmyth-version
-                    QFile file("/tmp/etc/KnoppMyth-version");
-                    if ( file.exists() )
-                    { //appears to be a knoppmyth version, proceed
-                        cout << "found knoppmyth-version" << endl;
-                        QFile kmfile("/tmp/etc/hostname");
-                        if ( kmfile.open(IO_ReadOnly | IO_Translate) )
-                        {
-                            QTextStream t( &kmfile );        // use a text stream
-                            line = t.readLine();
-                            flag=true;
-                            currentitem = line.stripWhiteSpace();
-                            current_hostname =  currentitem   ;
-                            //gContext->ActivateSettingsCache(true);
-                            gContext->ClearSettingsCache();
-                            gContext->SetSetting("HostMyhostname",current_hostname);
-                            gContext->SaveSetting("HostMyhostname",current_hostname);
-                        }
-                        kmfile.close();
-                        cout << current_hostname << endl;
-                        runNextSetting = ask_validate_network();
-                    }
-                    else
-                    {
-                         //popup things went wrong
-                        DialogCode returncode  = MythPopupBox::Show2ButtonPopup(gContext->GetMainWindow(),
-                                QString(""),
-                                QObject::tr("Couldn't find the old config file, proceed with update?"),
-                                QObject::tr("No"), QObject::tr("Yes"), kDialogCodeButton1);
-                        if ( returncode == kDialogCodeButton1 )
-                        {
-                            runNextSetting = ask_validate_network();
-                        }
-                        else if ( returncode == kDialogCodeButton0 )
-                        {
-                            runNextSetting = 1;
-                        }
-                    }
-
-                }
-            }
-
-    }
-
-
-//run through the system settings
-if ( runNextSetting == 0 )
-{
-    tflag = runsettings(false,false,true,true,false,false,false,false,false,false,true,false);
-
-}
-else
-{
-    cancelPopup();
-    showPopup();
-}
-
-if ( tflag == 1 )
-    {
-        cancelPopup();
-        GO_popup(installwarningtext);
-    }
-    else
-    {
-    cancelPopup();
-    showPopup();
-    }
-
-}
-
-void busy_network(void)
-{
-    MythBusyDialog *busy = new MythBusyDialog(
-                                            QObject::tr("Starting network"));
-    busy->start();
-    int return_code = 0;
-    while (  return_code  == 0 )
-    {
-        qApp->processEvents ();
-        usleep(900);
-        return_code = myth_system("ps -ef|grep install_proxy.sh| grep setup_network |grep -v grep > /dev/null");
-    }
-    busy->Close();
-    busy->deleteLater();
-}
-
-
-int  WelcomeDialog::ask_validate_network(void)
-{
-
-    QString pop_text="abc";
-    int retval = 1;
-    while ( retval != 0 )
-    {
-        int settingsrec =  runsettings(false,true,false,false,false,false,false);
-        if ( settingsrec != 1 )
-            return 1;
-        else
-        {
-            MythProgressDialog *network_check = NULL;
-            network_check = new MythProgressDialog(QObject::tr("Please wait while the network is checked."), 6);
-            updateScreen();
-            QString cmdtxt;
-            cmdtxt=MV_ROOT  ;
-            cmdtxt.append("bin/install_proxy.sh network_check_it setup_network &");
-            retval =  system(cmdtxt);
-            busy_network();
-            if (network_check)
-            {
-                network_check->setProgress(1);
-                cmdtxt=MV_ROOT  ;
-                cmdtxt.append("bin/install_proxy.sh network_check_it check_self");
-                retval =  system(cmdtxt);
-                if ( retval != 0 )
-                {
-                    network_check->Close();
-                    pop_text="Could not find myself on the network";
-                }
-            }
-
-                if ( retval == 0)
-                {
-                    network_check->setProgress(2);
-                    cmdtxt=MV_ROOT  ;
-                    cmdtxt.append("bin/install_proxy.sh network_check_it check_gw");
-                    retval =  system(cmdtxt);
-                    if ( retval != 0 )
-                        {
-                            network_check->Close();
-                            pop_text="Could not locate gateway";
-                        }
-                }
-
-                if (retval == 0)
-                {
-                    network_check->setProgress(3);
-                    cmdtxt=MV_ROOT  ;
-                    cmdtxt.append("bin/install_proxy.sh network_check_it check_ns");
-                    retval =  system(cmdtxt);
-                    if ( retval != 0 )
-                    {
-                        network_check->Close();
-                        pop_text="Could not locate nameserver";
-                    }
-                }
-                if (retval == 0)
-                {
-                    network_check->setProgress(4);
-                                        cmdtxt=MV_ROOT  ;
-                    cmdtxt.append("bin/install_proxy.sh network_check_it check_names");
-                    retval =  system(cmdtxt);
-                    if ( retval != 0 )
-                    {
-                        network_check->Close();
-                        pop_text="Could not lookup names";
-                    }
-                }
-                if (retval == 0)
-                {
-                    network_check->setProgress(5);
-                                        cmdtxt=MV_ROOT  ;
-                    cmdtxt.append("bin/install_proxy.sh network_check_it host_names");
-                    retval =  system(cmdtxt);
-                    if ( retval != 0 )
-                    {
-                        network_check->Close();
-                        pop_text="Hostname already on the network";
-                    }
-                }
-
-
-                network_check->setProgress(6);
-                if (network_check)
-                    {
-                        network_check->Close();
-                        network_check->deleteLater();
-                    }
-
-                if (retval != 0 )
-                {
-                   DialogCode  val = MythPopupBox::Show2ButtonPopup(gContext->GetMainWindow(),  QString(""),  QObject::tr(pop_text),                              QObject::tr("Continue"), QObject::tr("Try again"), kDialogCodeButton0);
-
-                    if (kDialogCodeButton0 == val )
-                         retval = 0;
-                }
-        }
-    }
-return 0;
-}
-
-
-void WelcomeDialog::install_it(void)
-{
-    QString installtype = gContext -> GetSetting("HOSTinstallationtype");
-    QString rootfs = gContext -> GetSetting("HOSTrootfstype");
-    QString datafs = gContext -> GetSetting("HOSTdatafstype");
-    QString rootsize = gContext -> GetSetting("HOSTOSsize");
-    rootsize=rootsize + "000";
-    QString usealldata = gContext -> GetSetting("HostUseALLdata");
-    QString datasize = gContext -> GetSetting("HOSTDATAsize");
-    QString uprootfs = gContext -> GetSetting("HOSTuprootfstype");
-    QString useswap = gContext -> GetSetting("HostUseSWAP");
-    QString swapsize = gContext -> GetSetting("HOSTSWAPsize");
-    if ( installtype != "Upgrade"  )
-        current_hostname = gContext->GetSetting("HostMyhostname");
-    QString clean_upgrade = getenv("CLEAN_UPGRADE");
-    if ( clean_upgrade == "YES" )
-        current_hostname = gContext->GetSetting("HostMyhostname");
-
-//get the hostname here if upgrade then use previous declarion of hostname
-    if ( usealldata == "1" )
-    {
-        datasize="ALL";
-    }
-    else
-    {
-    datasize=datasize + "000";
-    }
-    if ( useswap == "0" )
-    {
-        swapsize="NO";
-    };
-
-
-    if ( installtype == "Full/Auto" )
-    {
-    QString currentitem;
-    QString line;
-    QFile file("/proc/meminfo");
-     if ( file.open(IO_ReadOnly | IO_Translate) )
-     {
-        QTextStream t( &file );        // use a text stream
-            line = t.readLine();
-             if ( line.startsWith("MemTotal:"))
-                {
-                currentitem = line.simplifyWhiteSpace();
-                currentitem = currentitem.section( " ", 1, 1 );
-                }
-     }
-     file.close();
-    bool ok;
-    int mem = currentitem.toInt( &ok, 10 );     // dec == 0, ok == FALSE
-    cout << mem << endl;
-    if ( mem >= 500000 )
-    {
-        cout << gContext -> GetSetting("HostXres")  << endl;
-        if ((gContext -> GetSetting("HostXres"))  == "1280x720" )
-            {
-                gContext->SaveSetting("Theme", "syth-lacquer-wide");
-                cout <<"Setting theme to syth-wide" << endl;
-            }
-    }
-
-
-    QString cmdtxt=MV_ROOT  ;
-    cmdtxt.append("bin/install_proxy.sh full_install_it " + install_drive + " " + rootfs + " " + rootsize + " " +  datafs + " " + datasize + " " + swapsize + "&");
-        system(cmdtxt);
-      }
-    else if  ( installtype == "Upgrade" )
-    {
-        QString cmdtxt=MV_ROOT  ;
-        cmdtxt.append("bin/install_proxy.sh upgrade_it " + install_drive + " " + uprootfs +  "&");
-        system(cmdtxt);
-    }
-    else if (installtype=="NET")
-    {
-        QString olddb = gContext->GetSetting("HostMysqlserver");
-        QString cmdtxt;
-        cmdtxt=MV_ROOT  ;
-        char localhostname[1024];
-        if (gethostname(localhostname, 1024))
-        {
-            VERBOSE(VB_IMPORTANT,
-                    "MCP: Error, could not determine host name." + ENO);
-            localhostname[0] = '\0';
-        }
-        QString h;
-        h=localhostname;
-        cout << "calling restore_default_settings with  hostname " << h << endl;
-        cmdtxt.append("bin/restore_default_settings.sh -c save -t syssettings  -d  127.0.0.1  -h " + h);
-        system(cmdtxt);
-        cmdtxt=MV_ROOT  ;
-        cmdtxt.append("bin/install_proxy.sh NETBOOT  " + install_drive +  "  &");
-        system(cmdtxt);
-    }
-    WORKING_ON_INSTALL = true;
-    usleep (500);
-    updateScreen();
-    usleep (500);
-    updateScreen();
-    cancelPopup();
-}
diff --git a/abs/core-testing/mythinstall/installdialog.h b/abs/core-testing/mythinstall/installdialog.h
deleted file mode 100755
index f1c98ab..0000000
--- a/abs/core-testing/mythinstall/installdialog.h
+++ /dev/null
@@ -1,101 +0,0 @@
-#ifndef WELCOMEDIALOG_H_
-#define WELCOMEDIALOG_H_
-
-#include <iostream>
-using namespace std;
-
-#include <qdatetime.h>
-#include "mythdialogs.h"
-#include "libmyth/dialogbox.h"
-class WelcomeDialog : public MythThemedDialog
-{
-
-  Q_OBJECT
-
-  public:
-
-    WelcomeDialog(MythMainWindow *parent,
-                       QString window_name,
-                       QString theme_filename,
-                       const char* name = 0);
-    ~WelcomeDialog();
-
-    void keyPressEvent(QKeyEvent *e);
-    void wireUpTheme();
-     int exec(void);
-
-  protected slots:
-    void updateAll(void);
-    void updateStatus(void);
-    void updateScreen(void);
-    void closeDialog();
-    void updateTime();
-    void showPopup();
-    void showPopup_2();
-    void GO_popup(QString);
-    void Reboot_popup();
-    void cancelPopup();
-    void MAINPopup();
-    QString diskmodel(QString,QString);
-    QString findinstallsouce(void);
-    void Display_2ndpopup();
-    bool updateRecordingList(void);
-    bool updateScheduledList(void);
-    void shutdownNow(int);
-
-    void install_hda(void);
-    void install_hdb(void);
-    void install_hdc(void);
-    void install_hdd(void);
-    void install_sda(void);
-    void install_sdb(void);
-    void install_sdc(void);
-    void install_sdd(void);
-    void install_net(void);
-    void install_generic(void);
-    void install_it(void);
-    void runLIVECD(void);
-    void busy_box(void);
-    void busy_find_oldsettings(void);
-    int ask_validate_network(void);
-  private:
-    void updateStatusMessage(void);
-    UITextType* getTextType(QString name);
-    MythPopupBox *popup;
-    DialogBox *reboot_box;
-    DialogBox *upgrade_box;
-    //
-    //  GUI stuff
-    //
-    UITextType          *m_status_text;
-    UITextType          *m_recording_text;
-    UITextType          *m_scheduled_text;
-    UITextType          *m_error_text;
-    UITextType          *m_mv_text;
-    UITextType          *m_warning_text;
-    UITextType          *m_time_text;
-    UITextType          *m_date_text;
-    QTimer         *m_updateStatusTimer;
-    QTimer         *m_updateScreenTimer;
-    QTimer         *m_timeTimer;
-
-    QString        m_installDir;
-    QString        m_timeFormat;
-    QStringList    m_statusList;
-    QString        install_drive ;
-    QString         install_text;
-    QString     version_text;
-    QString recording_text;
-    QString  scheduled_text;
-    QString  error_text;
-    QString mythvantage_text;
-    string bin_prefix;
-    QString current_hostname;
-
-     bool I_AM_BUSY;
-     bool WORKING_ON_INSTALL;
-
-
-};
-
-#endif
diff --git a/abs/core-testing/mythinstall/installsettings.cpp b/abs/core-testing/mythinstall/installsettings.cpp
deleted file mode 100755
index 8118132..0000000
--- a/abs/core-testing/mythinstall/installsettings.cpp
+++ /dev/null
@@ -1,4556 +0,0 @@
-//_include <mythcontext.h>
-#include <unistd.h>
-#include <iostream>
-#include <fstream>
-#include <stdio.h>
-#include "settings.h"
-
-#include <string>
-#include <fstream>
-#include <sstream>
-#include <stdexcept>
-#include <vector>
-#include <cassert>
-#include <algorithm>
-#include <tr1/unordered_map>
-
-
-#include <sys/wait.h>   // For WIFEXITED on Mac OS X
-#include <qapplication.h>
-#include "mythcontext.h"
-#include "libmyth/mythdialogs.h"
-#include "mythdbcon.h"
-#include "lcddevice.h"
-#include "tv.h"
-#include "programinfo.h"
-#include "uitypes.h"
-#include "remoteutil.h"
-#include <qdir.h>
-#include <qimage.h>
-#include <stdlib.h>
-#include <cstdlib>
-
-#include "installsettings.h"
-#include "installdialog.h"
-#include "xorgsettings.h"
-#include "password_manage.h"
-#include "misc_settings.h"
-#include "infrared.h"
-
-#include <qsqldatabase.h>
-#include <qsqlquery.h>
-#include "mv_common.h"
-
-int timezone_unknown = FALSE;
-extern  HostParms hostparm;
-extern DDCinfo ddcinfo;
-
-
-
-bool displaymysqlonly = false ;
-bool displayshownetwork =false ;
-bool displayshowhostype = false ;
-bool displayshowmisc =false ;
-bool displayshowshutdown =false ;
-bool displayshowadvanced = false;
-bool displayshowsound = false ;
-bool displayshowadvancedX = false;
-bool displayaccesscontrol= false;
-bool displayplugins = false;
-bool displayuser = false;
-bool displaywebuser = false;
-bool displayddns = false;
-bool displayinfrared = false;
-bool displayscreensaver = false;
-bool  install_hobbit = false;
-
-
-static HostComboBox *ThemePainter()
-{
-    HostComboBox *gc = new HostComboBox("ThemePainter");
-    gc->setLabel(QObject::tr("Paint Engine"));
-    gc->addSelection(QObject::tr("Qt"), "qt");
-    gc->addSelection(QObject::tr("OpenGL"), "opengl");
-    gc->setHelpText(QObject::tr("This selects what Myth uses to draw.  If you have decent hardware, select OpenGL. Changing this requires a restart."));
-    return gc;
-
-}
-static HostComboBox *HostMyhostname()
-{
-    HostComboBox *gc = new HostComboBox("HostMyhostname",true);
-    gc->setLabel(QObject::tr("Hostname"));
-    gc->addSelection("Envy");
-    gc->addSelection("Greed");
-    gc->addSelection("Lust");
-    gc->addSelection("Sloth");
-    gc->addSelection("Wrath");
-    gc->addSelection("Gluttony");
-    gc->addSelection("Pride");
-    gc->addSelection("Humility");
-    gc->addSelection("Generosity");
-    gc->addSelection("Love");
-    gc->addSelection("Kindness");
-    gc->addSelection("SelfControl");
-    gc->addSelection("Faith");
-    gc->addSelection("Zeal");
-    gc->addSelection("type_hostname_here");
-    gc->setHelpText(QObject::tr("Hostname of this machine"));
-    return gc;
-};
-
-static HostCheckBox *HostDHCPHostname()
-{
-    HostCheckBox *gc = new HostCheckBox("HostDHCPhostname");
-    gc->setLabel(QObject::tr("Use Hostname provided by DHCP"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Checking this will use the hostname as provided by dhcp for the default interface.  If none is provided by DHCP it will use the hostname provided in the hostname box"));
-    return gc;
-};
-
-
-static HostLineEdit *HostDDnslogin()
-{
-    HostLineEdit *gc = new HostLineEdit("HostDDnslogin");
-        gc->setLabel(QObject::tr("Login"));
-    gc->setValue("");
-    gc->setHelpText(QObject::tr("Login for ddns account"));
-    return gc;
-};
-
-static HostLineEdit *HostDDnspassword()
-{
-    HostLineEdit *gc = new HostLineEdit("HostDDnspassword");
-    gc->setLabel(QObject::tr("Password"));
-    gc->setValue("");
-    gc->SetPasswordEcho(true);
-    gc->setHelpText(QObject::tr("Password for ddns account."));
-    return gc;
-};
-
-static HostLineEdit *HostDDnshostname()
-{
-    HostLineEdit *gc = new HostLineEdit("HostDDnshostname");
-    gc->setLabel(QObject::tr("DDNS hostname"));
-    gc->setValue("");
-    gc->setHelpText(QObject::tr("Hostname used for DDNS."));
-    return gc;
-};
-
-static HostCheckBox *HostDDnsEnable()
-{
-    HostCheckBox *gc = new HostCheckBox("HostDDnsEnable");
-    gc->setLabel(QObject::tr("Enable DDNS support"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Update DDNS records at dyndns.com. Visit http://dyndns.com to setup your account."));
-    return gc;
-};
-
-class DDnssettings: public TriggeredConfigurationGroup {
-public:
-    DDnssettings():
-        TriggeredConfigurationGroup(false,false,false,false) {
-         setLabel(QObject::tr("DDNS settings"));
-        SetVertical(true);
-        Setting* trigger = HostDDnsEnable() ;
-        addChild(trigger);
-        setTrigger(trigger);
-
-        ConfigurationGroup* settings = new VerticalConfigurationGroup(false,false,false,false);
-                settings->addChild(HostDDnshostname());
-                settings->addChild(HostDDnslogin());
-                settings->addChild(HostDDnspassword());
-
-        addTarget("0", new VerticalConfigurationGroup(false, false));
-        addTarget("1", settings);
-    };
-};
-
-
-
-
-// static HostLineEdit *HostIP()
-// {
-//     HostLineEdit *gc = new HostLineEdit("HostIP");
-//     gc->setLabel(QObject::tr("Ip address"));
-//     gc->setValue("192.168.1.12");
-//     gc->setHelpText(QObject::tr("IP address of the new installation"));
-//     return gc;
-// };
-//
-// static HostComboBox *HostNETMASK()
-// {
-//     HostComboBox *gc = new HostComboBox("HostNETMASK");
-//         gc->setLabel(QObject::tr("Netmask"));
-//         gc->addSelection("/0     0.0.0.0");
-//         gc->addSelection("/1     128.0.0.0");
-//         gc->addSelection("/2     192.0.0.0");
-//         gc->addSelection("/3     224.0.0.0");
-//         gc->addSelection("/4     240.0.0.0");
-//         gc->addSelection("/5     248.0.0.0");
-//         gc->addSelection("/6     252.0.0.0");
-//         gc->addSelection("/7     254.0.0.0");
-//         gc->addSelection("/8     255.0.0.0");
-//         gc->addSelection("/9     255.128.0.0");
-//         gc->addSelection("/10    255.192.0.0 ");
-//         gc->addSelection("/11    255.224.0.0");
-//         gc->addSelection("/12    255.240.0.0");
-//         gc->addSelection("/13    255.248.0.0");
-//         gc->addSelection("/14    255.252.0.0");
-//         gc->addSelection("/15    255.254.0.0");
-//         gc->addSelection("/16    255.255.0.0");
-//         gc->addSelection("/17    255.255.128.0");
-//         gc->addSelection("/18    255.255.192.0");
-//         gc->addSelection("/19    255.255.224.0");
-//         gc->addSelection("/20    255.255.240.0");
-//         gc->addSelection("/21    255.255.248.0");
-//         gc->addSelection("/22    255.255.252.0");
-//         gc->addSelection("/23    255.255.254.0");
-//         gc->addSelection("/24    255.255.255.0");
-//         gc->addSelection("/25    255.255.255.128");
-//         gc->addSelection("/26    255.255.255.192");
-//         gc->addSelection("/27    255.255.255.224");
-//         gc->addSelection("/28    255.255.255.240");
-//         gc->addSelection("/29    255.255.255.248");
-//         gc->addSelection("/30    255.255.255.252");
-//         gc->addSelection("/31    255.255.255.254");
-//         gc->addSelection("/32    255.255.255.255");
-//         gc->setHelpText(QObject::tr("Netmask"));
-//         gc->setValue(24);
-//     return gc;
-// };
-
-
-QString findnet()
-{
-
-QString netdev="";
-//QString netdev="eth0 eth1 wlan0 wlan1 ath0 ";
-//QString netdev="eth0 eth1";
-system("/sbin/ifconfig -a > /tmp/.netinfo");
-QString line;
-QFile file("/tmp/.netinfo");
-    if ( file.open(IO_ReadOnly | IO_Translate) )
-    {
-        QTextStream t( &file );        // use a text stream
-        while ( !t.eof() )
-        {
-            line = t.readLine();
-            if ( line.contains("HWaddr"))
-                {
-                    QString s = line.simplifyWhiteSpace();
-                    s = s.section( " ", 0, 0 );   // s == "surname"
-                    netdev+=s;
-                    netdev+=" ";
-                }
-        }
-        file.close();
-    }
-return netdev;
-}
-
-QString findnet_wireless()
-{
-
-QString netdev="";
-//QString netdev="eth0 eth1 wlan0 wlan1 ath0 ";
-system("/usr/sbin/iwconfig  > /tmp/.netinfo_wireless");
-QString line;
-QFile file("/tmp/.netinfo_wireless");
-    if ( file.open(IO_ReadOnly | IO_Translate) )
-    {
-        QTextStream t( &file );        // use a text stream
-        while ( !t.eof() )
-        {
-            line = t.readLine();
-            if ( line.contains("Nickname") || line.contains("ESSID"))
-                {
-                    QString s = line.simplifyWhiteSpace();
-                    s = s.section( " ", 0, 0 );   // s == "surname"
-                    netdev+=s;
-                    netdev+=" ";
-                }
-        }
-        file.close();
-    }
-return netdev;
-}
-
-static HostComboBox *HostNetDevice()
-{
-    HostComboBox *gc = new HostComboBox("HostNetDevice");
-    gc->setLabel(QObject::tr("Device"));
-    QString foundnet=findnet();
-    cout << foundnet << endl;
-
-    if (foundnet.contains(hostparm.ThisHostnetOLD))
-        {
-//             cout << "old setting is still active" << endl;
-//             cout << hostparm.ThisHostnetOLD << endl;
-            QString s = "HostActiveonboot";
-            s+=hostparm.ThisHostnetOLD;
-            gContext->SaveSetting(s, hostparm.ThisHostnetActiveOLD );
-        }
-
-    if (foundnet.contains("eth0"))
-        gc->addSelection("eth0");
-
-    if (foundnet.contains("eth1"))
-        gc->addSelection("eth1");
-
-    if (foundnet.contains("wlan0"))
-        gc->addSelection("wlan0");
-
-    if (foundnet.contains("wlan1"))
-        gc->addSelection("wlan1");
-
-    if (foundnet.contains("ath0"))
-        gc->addSelection("ath0");
-
-    int findoldnetdevice=gc->findSelection(hostparm.ThisHostnetOLD);
-    gc->setValue(findoldnetdevice);
-
-
-
-    gc->setHelpText(QObject::tr("Network interface"));
-    return gc;
-};
-
-// static HostLineEdit *HostGW()
-// {
-//     HostLineEdit *gc = new HostLineEdit("HostGW");
-//     gc->setLabel(QObject::tr("Gateway"));
-//     gc->setValue("192.168.1.1");
-//     gc->setHelpText(QObject::tr("This is the default route"));
-//     return gc;
-// };
-//
-// static HostLineEdit *HostDNS()
-// {
-//     HostLineEdit *gc = new HostLineEdit("HostDNS");
-//     gc->setLabel(QObject::tr("Name server"));
-//     gc->setValue("192.168.1.1");
-//     gc->setHelpText(QObject::tr("Name server"));
-//     return gc;
-// };
-
-static HostCheckBox *HostActiveonboot()
-{
-    HostCheckBox *gc = new HostCheckBox("HostActiveonboot");
-    gc->setLabel(QObject::tr("Device is active on boot"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Network is started on boot"));
-    return gc;
-};
-
-
-static HostCheckBox *HostServiceSamba()
-{
-    HostCheckBox *gc = new HostCheckBox("HostServiceSamba");
-    gc->setLabel(QObject::tr("Windows sharing"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Allow window machines to access recorded files"));
-    return gc;
-};
-
-static HostCheckBox *HostServiceSamba_write()
-{
-    HostCheckBox *gc = new HostCheckBox("HostServiceSamba_write");
-    gc->setLabel(QObject::tr("Readonly"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("If checked, all remote connections will be read only.  If not checked then remote clients will have write and delete abilites. "));
-    return gc;
-};
-
-
-static HostCheckBox *HostServiceSamba_writehome()
-{
-    HostCheckBox *gc = new HostCheckBox("HostServiceSamba_writehome");
-    gc->setLabel(QObject::tr("Readonly"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("If checked, all remote connections will be read only.  If not checked then remote clients will have write and delete abilites. "));
-    return gc;
-};
-
-static HostCheckBox *HostServiceSamba_media()
-{
-    HostCheckBox *gc = new HostCheckBox("HostServiceSamba_media");
-    gc->setLabel(QObject::tr("share media"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr(" "));
-    return gc;
-};
-
-static HostCheckBox *HostServiceSamba_home()
-{
-    HostCheckBox *gc = new HostCheckBox("HostServiceSamba_home");
-    gc->setLabel(QObject::tr("share home"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr(" "));
-    return gc;
-};
-
-
-
-static HostComboBox *HostServiceSamba_domain()
-{
-    HostComboBox *gc = new HostComboBox("HostServiceSamba_domain",true);
-    gc->setLabel(QObject::tr("Workgroup"));
-    gc->setHelpText(QObject::tr("Workgroup for smb share"));
-    gc->addSelection("WORKGROUP");
-    QString currentitem;
-    QString line;
-    QFile file("/tmp/smbdomainlist");
-    if ( file.open(IO_ReadOnly | IO_Translate) )
-    {
-        QTextStream t( &file );        // use a text stream
-        while ( !t.eof() )
-        {
-            line = t.readLine();
-            if ( line.startsWith("domain"))
-                {
-                currentitem = line.section( " ", 1, 1 );
-                if ( currentitem != "-" )
-                    gc->addSelection(currentitem);
-                }
-        }
-        file.close();
-    }
-    gc->addSelection("type_workgroup_here");
-    return gc;
-};
-
-static HostCheckBox *HostLircWait()
-{
-    HostCheckBox *gc = new HostCheckBox("HostLircWait");
-    gc->setLabel(QObject::tr("Wait for lirc"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("System will wait for lirc before starting the UI "));
-    return gc;
-};
-
-
-static HostComboBox *HostEvrouterConfig()
-{
-    HostComboBox *gc = new HostComboBox("HostEvrouterConfig",true);
-    gc->setLabel(QObject::tr("Layout"));
-    gc->setHelpText(QObject::tr("Choose the keypad layout"));
-    QString dirtxt;
-    dirtxt=MV_ROOT;
-    dirtxt.append("templates/evrouter");
-    QDir evrouter(dirtxt);
-    //evrouter.setFilter(QDir::Dirs);
-    evrouter.setSorting(QDir::Name | QDir::IgnoreCase);
-    const QFileInfoList *infos = evrouter.entryInfoList();
-    const QFileInfo *info;
-    if (!infos)
-        return gc;
-    QFileInfoListIterator infoIt( *infos );
-    QString currentitem = ".";
-    while( (info=infoIt.current()) != 0 )
-    {
-        currentitem = info->baseName( TRUE );
-        if ( currentitem != ".." && currentitem != "." && currentitem != "")
-        {
-            gc->addSelection(currentitem);
-        }
-        ++infoIt;
-    }
-    gc->addSelection("tinker");
-    return gc;
-};
-
-
-static HostCheckBox *HostServiceNFS()
-{
-    HostCheckBox *gc = new HostCheckBox("HostServiceNFS");
-    gc->setLabel(QObject::tr("Standard file sharing"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("Allow all machines to access recorded files with nfs"));
-    return gc;
-};
-
-
-static HostCheckBox *HostServiceMythWEB()
-{
-    HostCheckBox *gc = new HostCheckBox("HostServiceMythWEB");
-    gc->setLabel(QObject::tr("Enable Mythweb"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Allow scheduling using a web browser"));
-    return gc;
-};
-
-static HostCheckBox *HostServiceHobbitclient()
-{
-    HostCheckBox *gc = new HostCheckBox("HostServiceHobbitclient");
-    gc->setLabel(QObject::tr("Hobbit-client"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Report stats and other stuff to the master backend"));
-    return gc;
-};
-
-static GlobalCheckBox *GlobalServiceHobbitserver()
-{
-    GlobalCheckBox *gc = new GlobalCheckBox("GlobalServiceHobbitserver");
-    gc->setLabel(QObject::tr("Hobbit-server"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("Run the hobbit server to collect stats and other stuff"));
-    return gc;
-};
-
-
-static HostCheckBox *HostServiceRRD()
-{
-    HostCheckBox *gc = new HostCheckBox("HostServiceRRD");
-    gc->setLabel(QObject::tr("rrd_stats"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Collect stats and create graphs of various system resources."));
-    return gc;
-};
-
-static HostCheckBox *HostUseDHCP()
-{
-    HostCheckBox *gc = new HostCheckBox("HostUseDHCP");
-    gc->setLabel(QObject::tr("Static ip address"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Enable to use a static ip address, otherwise dhcp will be used."));
-    return gc;
-};
-
-static HostCheckBox *HostRunDHCP()
-{
-    HostCheckBox *gc = new HostCheckBox("HostRunDHCP");
-    gc->setLabel(QObject::tr("DHCP server"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Check to run a dhcp server."));
-    return gc;
-};
-
-static HostCheckBox *HostRunEvrouter()
-{
-    HostCheckBox *gc = new HostCheckBox("HostRunEvrouter");
-    gc->setLabel(QObject::tr("Enable special keys"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Check if using evrouter"));
-    return gc;
-};
-
-static HostCheckBox *HostUsemythfrontend()
-{
-    HostCheckBox *gc = new HostCheckBox("HostUseMythWelcome");
-    gc->setLabel(QObject::tr("Run MythWelcome"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("If this option is checked mythwelcome will be started, instead of the usual frontend"));
-    return gc;
-};
-
-static HostCheckBox *HostRunFrontend()
-{
-    HostCheckBox *gc = new HostCheckBox("HostRunFrontend");
-    gc->setLabel(QObject::tr("Run the Frontend."));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("If this option is checked mythfrontend will also start"));
-    return gc;
-};
-
-
-/*
-static HostComboBox *HostTransmitproto()
-{
-    HostComboBox *gc = new HostComboBox("HostTransmitproto",false);
-    gc->setLabel(QObject::tr("Transmitter"));
-    gc->addSelection("none");
-    gc->setValue(0);
-    gc->setHelpText(QObject::tr("Remote codes to control a cable box"));
-    QString dirtxt;
-    dirtxt=MV_ROOT;
-    dirtxt.append("templates/transmit");
-    QDir transmit(dirtxt);
-    transmit.setFilter(QDir::Dirs);
-    transmit.setSorting(QDir::Name | QDir::IgnoreCase);
-    const QFileInfoList *infos = transmit.entryInfoList();
-    const QFileInfo *info;
-    if (!infos)
-        return gc;
-    QFileInfoListIterator infoIt( *infos );
-    QString currentitem = ".";
-    while( (info=infoIt.current()) != 0 )
-    {
-        currentitem = info->baseName( TRUE );
-        if ( currentitem != ".." && currentitem != "." && currentitem != "")
-        {
-            gc->addSelection(currentitem);
-        }
-        ++infoIt;
-    }
-    return gc;
-};
-
-
-
-static HostComboBox *HostReceiverType()
-{
-    HostComboBox *gc = new HostComboBox("HostReceiverType");
-    gc->setLabel(QObject::tr("Receiver"));
-    gc->addSelection("Default");
-    gc->addSelection("Serial");
-    gc->addSelection("Usb");
-    gc->addSelection("Usb-imon");
-    gc->addSelection("Hauppauge");
-    gc->addSelection("tinker");
-    gc->setHelpText(QObject::tr("The type of infrared receiver and transmitter being used."));
-    gc->setValue("Default");
-    return gc;
-};
-
-static HostComboBox *HostSerialPortlirc()
-{
-    HostComboBox *gc = new HostComboBox("HostSerialPortlirc",false);
-    gc->setLabel(QObject::tr("Serial Port"));
-    gc->addSelection("ttyS0");
-    gc->addSelection("ttyS1");
-    gc->addSelection("ttyS2");
-    gc->addSelection("ttyS3");
-    gc->setHelpText(QObject::tr("Serial port with the lirc receiver or transmitter"));
-    return gc;
-}
-
-*/
-
-static HostComboBox *HostMysqlserverip_listbox()
-{
-    HostComboBox *gc = new HostComboBox("HostMysqlServer",true);
-    gc->setLabel(QObject::tr("Mysql server"));
-
-    QString currentitem;
-    QString prevline;
-    QString line;
-    QFile file("/tmp/mysqllist");
-        if ( file.open(IO_ReadOnly | IO_Translate) )
-        {
-        QTextStream t( &file );        // use a text stream
-        while ( !t.eof() )
-            {
-            line = t.readLine();
-            if ( line.startsWith("   address"))
-                {
-                currentitem = line.section( " ", 5, 5 );
-                currentitem = currentitem.section( "[" , 1,1 );
-                currentitem = currentitem.section( "]" , 0, 0 );
-
-                currentitem = currentitem + "\t" +  prevline.section( " ",5,5  );
-                //cout << currentitem  << endl;
-                gc->addSelection(currentitem);
-                }
-                prevline = line;
-                }
-            file.close();
-            //system ("rm -f /tmp/mysqllist");
-        }
-    gc->addSelection("Manual: type ip here");
-    gc->setHelpText(QObject::tr(""));
-
-    QString NETBOOT = getenv("NETBOOT");
-    NETBOOT=NETBOOT.stripWhiteSpace();
-    if ( NETBOOT   != "YES" )
-    {
-        if ( ((gContext->GetSetting("HostaccesshostypeSystemtype")) == "0" ))
-            gc->setEnabled(false);
-    }
-
-    return gc;
-}
-
-
-
-static HostCheckBox *HostRemoteBackup()
-{
-    HostCheckBox *gc = new HostCheckBox("HostRemoteBackup");
-    gc->setLabel(QObject::tr("Remote Backup"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Copy the resulting backup file to another location"));
-    return gc;
-};
-
-
-static HostComboBox *HostRemoteBackupDir()
-{
-    QString tempItem;
-    HostComboBox *gc = new HostComboBox("HostRemoteBackupDir",true);
-    gc->setLabel(QObject::tr("dir or host" ));
-    gc->addSelection("dir:/localdir");
-    MSqlQuery query(MSqlQuery::InitCon());
-
-
-    query.prepare( "SELECT DISTINCT hostname from settings where hostname is not null and not (hostname=:HOSTNAME);");
-    query.bindValue( ":HOSTNAME" ,   gContext->GetHostName()  );
-    if (query.exec() && query.isActive() && query.size() > 0)
-    {
-        while (query.next())
-        {
-            tempItem = query.value(0).toString();
-            gc->addSelection(tempItem);
-        }
-    }
-
-    gc->setHelpText(QObject::tr("Host to copy backup file to.   dir:/$localdir   will copy to a local directory instead of a remote host "));
-
-    return gc;
-};
-
-class Backupsettings: public TriggeredConfigurationGroup {
-public:
-    Backupsettings():
-        TriggeredConfigurationGroup(false, false, true, true,false, false, true, true) {
-        SetVertical(false);
-        setLabel(QObject::tr("Backup Settings"));
-        Setting* trigger = HostRemoteBackup();
-        addChild(trigger);
-        setTrigger(trigger);
-        ConfigurationGroup* settings = new VerticalConfigurationGroup(false,false);
-            settings->addChild(HostRemoteBackupDir());
-
-        addTarget("0", new VerticalConfigurationGroup(false, false));
-        addTarget("1", settings);
-
-    };
-};
-
-
-
-static HostCheckBox *HostPKG_MIRROR()
-{
-    HostCheckBox *gc = new HostCheckBox("HostPKG_MIRROR");
-    gc->setLabel(QObject::tr("Use Local mirror"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Master Backend will be used as the repo source."));
-    return gc;
-};
-
-static GlobalCheckBox *GlobalPKG_MIRROR()
-{
-    GlobalCheckBox *gc = new GlobalCheckBox("GlobalPKG_MIRROR");
-    gc->setLabel(QObject::tr("Local mirror"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Keep a local copy of the packages.  Allow other frontends to install from the local copy."));
-    return gc;
-};
-
-
-
-static HostCheckBox *HostncidClient()
-{
-    HostCheckBox *gc = new HostCheckBox("HostncidClient");
-    gc->setLabel(QObject::tr("Show Callerid"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("Callerid popup,  backend must be running the callerid program"));
-    return gc;
-};
-
-static HostCheckBox *HostncidDaemon()
-{
-    HostCheckBox *gc = new HostCheckBox("HostncidDaemon");
-    gc->setLabel(QObject::tr("Run Callerid "));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Run Daemon to collect callerid info"));
-    return gc;
-};
-
-static HostComboBox *HostSerialPortncid()
-{
-    HostComboBox *gc = new HostComboBox("HostSerialPortncid",false);
-    gc->setLabel(QObject::tr("Serial Port"));
-    gc->addSelection("ttyS0");
-    gc->addSelection("ttyS1");
-    gc->addSelection("ttyS2");
-    gc->addSelection("ttyS3");
-    gc->setHelpText(QObject::tr("Serial port where callerid capable modem is connected"));
-    return gc;
-}
-
-static HostCheckBox *Hostbootsplash()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostbootsplash");
-    gc->setLabel(QObject::tr("Enable bootsplash"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Covers up boot messages. "));
-    return gc;
-};
-
-//-------------------------------------screensaver settings-------------------
-
-static HostComboBox *HostScreensaverType()
-{
-    HostComboBox *gc = new HostComboBox("HostScreensaverType");
-    gc->setLabel(QObject::tr("Screensaver program"));
-    gc->addSelection("xscreensaver");
-    gc->addSelection("gscreensaver");
-    gc->addSelection("none");
-    gc->addSelection("tinker");
-    gc->setHelpText(QObject::tr("Screen saver program to use."));
-    gc->setValue("none");
-    return gc;
-};
-
-static HostSpinBox *HostScreensaverIdle()
-{
-    HostSpinBox *gc = new HostSpinBox("HostScreensaverIdle", 5, 60, 1, true);
-    gc->setLabel(QObject::tr("Idle time"));
-    gc->setValue(5);
-    gc->setHelpText(QObject::tr("Number of minutes to wait before starting screensaver."  ));
-    return gc;
-}
-
-static HostCheckBox *HostScreensaverBlank()
-{
-    HostCheckBox *gc = new HostCheckBox("HostScreensaverBlank");
-    gc->setLabel(QObject::tr("Blank"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Blank the screen instead of using a screensaver"));
-    return gc;
-};
-
-static HostCheckBox *HostScreensaverRandom()
-{
-    HostCheckBox *gc = new HostCheckBox("HostScreensaverRandom");
-    gc->setLabel(QObject::tr("Random"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Use a random screensaver"));
-    return gc;
-};
-
-
-
-static HostComboBox *HostGScreensaverTheme()
-{
-    HostComboBox *gc = new HostComboBox("HostGScreensaverTheme");
-    gc->setLabel(QObject::tr("Screensaver"));
-    gc->setHelpText(QObject::tr("Screen saver program to use."));
-    QString line;
-    QString dirtxt=MV_ROOT;
-    dirtxt.append("templates/gscreensavers");
-    QFile file(dirtxt);
-    if ( file.open(IO_ReadOnly | IO_Translate) )
-    {
-        QTextStream t( &file );        // use a text stream
-        while ( !t.eof() )
-        {
-            line = t.readLine();
-             gc->addSelection(line);
-        }
-        file.close();
-    }
-    return gc;
-};
-
-static HostComboBox *HostXScreensaverTheme()
-{
-    HostComboBox *gc = new HostComboBox("HostXScreensaverTheme");
-    gc->setLabel(QObject::tr("Screensaver"));
-    gc->setHelpText(QObject::tr("Screen saver to display."));
-    QString dirtxt;
-    dirtxt=MV_ROOT;
-    dirtxt.append("templates/xscreensavers");
-    //read in from a file.
-    QString line;
-    QFile file(dirtxt);
-    if ( file.open(IO_ReadOnly | IO_Translate) )
-    {
-        QTextStream t( &file );        // use a text stream
-        while ( !t.eof() )
-        {
-            line = t.readLine();
-             gc->addSelection(line);
-        }
-        file.close();
-    }
-    return gc;
-};
-
-class Screensaverhostsettings: public TriggeredConfigurationGroup {
-public:
-    Screensaverhostsettings():
-
-        TriggeredConfigurationGroup() {
-        SetVertical(true);
-        setLabel(QObject::tr("Screensaver settings (1/1)"));
-        Setting* trigger = HostScreensaverType() ;
-        addChild(trigger);
-        setTrigger(trigger);
-        ConfigurationGroup* screensaversettings = new GridConfigurationGroup(2);
-            screensaversettings->addChild(HostScreensaverBlank());
-            screensaversettings->addChild(HostScreensaverRandom());
-
-        ConfigurationGroup* xscreensaversettings = new VerticalConfigurationGroup();
-            xscreensaversettings->addChild(screensaversettings);
-            xscreensaversettings->addChild(HostScreensaverIdle());
-            xscreensaversettings->addChild(HostXScreensaverTheme());
-
-
-        ConfigurationGroup* gscreensaversettings = new VerticalConfigurationGroup();
-            gscreensaversettings->addChild(screensaversettings);
-            gscreensaversettings->addChild(HostScreensaverIdle());
-            gscreensaversettings->addChild(HostGScreensaverTheme());
-
-
-
-        addTarget("tinker", new VerticalConfigurationGroup(false, false));
-        addTarget("none", new VerticalConfigurationGroup(false, false));
-        addTarget("gscreensaver", gscreensaversettings);
-        addTarget("xscreensaver", xscreensaversettings);
-    };
-};
-
-
-
-
-//-------------------------------------access setting----------------------
-
-static HostCheckBox *Hostaccessnetwork()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostaccessnetwork");
-    gc->setLabel(QObject::tr("Network "));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Control access to network screen. Checked means the screen is enabled."));
-    return gc;
-};
-
-static HostCheckBox *Hostaccesshostype()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostaccesshostype");
-    gc->setLabel(QObject::tr("hostype "));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("Control access to hostype screen. Checked means the screen is enabled."));
-    return gc;
-};
-
-static HostCheckBox *HostaccesshostypeSystemtype()
-{
-    HostCheckBox *gc = new HostCheckBox("HostaccesshostypeSystemtype");
-    gc->setLabel(QObject::tr("Change hostype"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Ability to change sql server and system type. Checked means the screen is enabled."));
-    return gc;
-};
-
-static HostCheckBox *Hostaccessmisc()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostaccessmisc");
-    gc->setLabel(QObject::tr("misc "));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("Control access to misc screen. Checked means the screen is enabled."));
-    return gc;
-};
-
-static HostCheckBox *Hostaccesssleep()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostaccesssleep");
-    gc->setLabel(QObject::tr("sleep "));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("Control access to sleep screen. Checked means the screen is enabled."));
-    return gc;
-};
-
-static HostCheckBox *Hostaccessadvanced()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostaccessadvanced");
-    gc->setLabel(QObject::tr("advanced "));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("Control access to advanced screen. Checked means the screen is enabled. "));
-    return gc;
-};
-
-static HostCheckBox *HostaccessadvancedX()
-{
-    HostCheckBox *gc = new HostCheckBox("HostaccessadvancedX");
-    gc->setLabel(QObject::tr("advancedX "));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("Control access to advancedX screen. Checked means the screen is enabled. "));
-    return gc;
-};
-static HostCheckBox *Hostaccesssound()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostaccesssound");
-    gc->setLabel(QObject::tr("sound "));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("Control access to sound screen. Checked means the screen is enabled."));
-    return gc;
-};
-
-static HostCheckBox *Hostaccessplugins()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostaccessplugins");
-    gc->setLabel(QObject::tr("plugins"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("Control access to plugin screen. Checked means the screen is enabled."));
-    return gc;
-};
-
-static HostCheckBox *Hostaccessuser()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostaccessuser");
-    gc->setLabel(QObject::tr("User"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Control access to the user managment screen. Checked means the screen is enabled."));
-    return gc;
-};
-
-static HostCheckBox *Hostaccesswebuser()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostaccesswebuser");
-    gc->setLabel(QObject::tr("Web password"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("Control access to the web password screen. Checked means the screen is enabled."));
-    return gc;
-};
-
-
-class ACCESShostsettings: public TriggeredConfigurationGroup {
-public:
-    ACCESShostsettings():
-        TriggeredConfigurationGroup(false,false,false,false) {
-        SetVertical(false);
-        Setting* trigger = Hostaccesshostype () ;
-        addChild(trigger);
-        setTrigger(trigger);
-
-        ConfigurationGroup* settings = new VerticalConfigurationGroup(false,false,false,false);
-                //settings->addChild(HostServiceSamba());
-                settings->addChild(HostaccesshostypeSystemtype());
-
-
-        addTarget("0", new VerticalConfigurationGroup(false, false));
-        addTarget("1", settings);
-    };
-};
-
-
-//----------------------------------  PLUGINS ----------------------
-
-static HostCheckBox *Hostpluginmytharchive()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostpluginmytharchive");
-    gc->setLabel(QObject::tr("mytharchive"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("check to enable mytharchive"));
-    return gc;
-};
-
-
-static HostCheckBox *Hostpluginmythbrowser()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostpluginmythbrowser");
-    gc->setLabel(QObject::tr("mythbrowser"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("check to enable mythbrowser"));
-    return gc;
-};
-
-
-static HostCheckBox *Hostpluginmythcontrols()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostpluginmythcontrols");
-    gc->setLabel(QObject::tr("mythcontrols"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("check to enable mythcontrols"));
-    return gc;
-};
-
-
-static HostCheckBox *Hostpluginmythflix()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostpluginmythflix");
-    gc->setLabel(QObject::tr("mythflix"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("check to enable mythflix"));
-    return gc;
-};
-
-
-static HostCheckBox *Hostpluginmythgallery()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostpluginmythgallery");
-    gc->setLabel(QObject::tr("mythgallery"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("check to enable mythgallery"));
-    return gc;
-};
-
-
-static HostCheckBox *Hostpluginmythgame()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostpluginmythgame");
-    gc->setLabel(QObject::tr("mythgame"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("check to enable mythgame"));
-    return gc;
-};
-
-static HostCheckBox *HostpluginmythgameZsnes()
-{
-    HostCheckBox *gc = new HostCheckBox("HostpluginmythgameZsnes");
-    gc->setLabel(QObject::tr("zsnes"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Zsnes, super nintendo emulator"));
-    return gc;
-};
-
-static HostCheckBox *HostpluginmythgameFceu()
-{
-    HostCheckBox *gc = new HostCheckBox("HostpluginmythgameFceu");
-    gc->setLabel(QObject::tr("fceu"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Fceu, nintendo emulator"));
-    return gc;
-};
-
-static HostCheckBox *HostpluginmythgameMame()
-{
-    HostCheckBox *gc = new HostCheckBox("HostpluginmythgameMame");
-    gc->setLabel(QObject::tr("mame"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Mame, Multiple Arcade Machine Emulator."));
-    return gc;
-};
-
-static HostCheckBox *HostpluginmythgameMednafen()
-{
-    HostCheckBox *gc = new HostCheckBox("HostpluginmythgameMednafen");
-    gc->setLabel(QObject::tr("Mednafen"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Mednafen is a portable, utilizing OpenGL and SDL, command-line driven multi-system emulator with many advanced features."));
-    return gc;
-};
-
-static HostCheckBox *HostpluginmythgameROMDB()
-{
-    HostCheckBox *gc = new HostCheckBox("HostpluginmythgameROMDB");
-    gc->setLabel(QObject::tr("Romdb"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("Table used my MythGames to store information about games. If you are into games, this is recommended."));
-    return gc;
-};
-
-
-static HostCheckBox *Hostpluginmythmovietime()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostpluginmythmovietime");
-    gc->setLabel(QObject::tr("mythmovietime"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("Check to enable mythmovietime"));
-    return gc;
-};
-
-
-static HostCheckBox *Hostpluginmythmusic()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostpluginmythmusic");
-    gc->setLabel(QObject::tr("mythmusic"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("check to enable mythmusic"));
-    return gc;
-};
-
-
-static HostCheckBox *Hostpluginmythnews()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostpluginmythnews");
-    gc->setLabel(QObject::tr("mythnews"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("check to enable mythnews"));
-    return gc;
-};
-
-
-static HostCheckBox *Hostpluginmythphone()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostpluginmythphone");
-    gc->setLabel(QObject::tr("mythphone"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("check to enable mythphone"));
-    return gc;
-};
-
-
-static HostCheckBox *Hostpluginmythsmolt()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostpluginmythsmolt");
-    gc->setLabel(QObject::tr("mythsmolt"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("check to enable mythsmolt"));
-    return gc;
-};
-
-
-static HostCheckBox *Hostpluginmythvideo()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostpluginmythvideo");
-    gc->setLabel(QObject::tr("mythvideo"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("check to enable mythvideo"));
-    return gc;
-};
-
-static HostCheckBox *Hostpluginmythvideo_dvdcss()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostpluginmythvideo_dvdcss");
-    gc->setLabel(QObject::tr("dvdcss"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("libdvdcss is a simple library designed for accessing DVDs like a block device without having to bother about the decryption."));
-    return gc;
-};
-
-
-static HostCheckBox *Hostpluginmythvodka()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostpluginmythvodka");
-    gc->setLabel(QObject::tr("mythvodka"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Myth Video On Demand Killer App."));
-    return gc;
-};
-
-
-static HostCheckBox *Hostpluginmythstream()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostpluginmythstream");
-    gc->setLabel(QObject::tr("mythstream"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("MythStream is an unofficial MythTv plugin that plays Internet audio and video streams."));
-    return gc;
-};
-
-static HostCheckBox *Hostpluginmythappletrailers()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostpluginmythappletrailers");
-    gc->setLabel(QObject::tr("MythAppleTrailers"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Used to stream trailer's from Apple's website."));
-    return gc;
-};
-
-
-static HostCheckBox *Hostpluginmythweather()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostpluginmythweather");
-    gc->setLabel(QObject::tr("mythweather"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("check to enable mythweather"));
-    return gc;
-};
-
-
-static HostCheckBox *HostMiro()
-{
-    HostCheckBox *gc = new HostCheckBox("HostMiro");
-    gc->setLabel(QObject::tr("Miro"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Miro is a popular, free, and open internet TV application. It brings video channels from thousands of sources and has more free HD than any otherplatform."));
-    return gc;
-};
-
-
-static HostCheckBox *HostXine()
-{
-    HostCheckBox *gc = new HostCheckBox("HostXine");
-    gc->setLabel(QObject::tr("Xine"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Xine is a free multimedia player"));
-    return gc;
-};
-
-
-static HostCheckBox *Hostwebmin()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostwebmin");
-    gc->setLabel(QObject::tr("Webmin"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Webmin is a web-based interface for system  administration for Unix. Once installed, you can access it at https://ip.of.back.end:10000 using your root password."));
-    return gc;
-};
-
-static HostCheckBox *Hostfuppes()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostfuppes");
-    gc->setLabel(QObject::tr("Fuppes"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Upnp server"));
-    return gc;
-};
-
-static HostCheckBox *Hostfoldingathome()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostfoldingathome");
-    gc->setLabel(QObject::tr("Folding@home"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("A distributed computing project which studies protein folding, misfolding, aggregation, and related diseases."));
-    return gc;
-};
-
-static HostComboBox *Hostfoldingusername()
-{
-    // If there is an old R5.5 style folding directory /myth/folding@home, attempt 
-    // to retrieve the old username.
-    
-    FILE *username_pipe;
-    username_pipe = 
-      popen (
-        "grep username= /myth/folding@home/client.cfg 2> /dev/null | "
-        "sed 's/username=//g'", "r");
-
-    if (username_pipe)
-    {
-      char username[200];
-      if (fgets (username, sizeof (username), username_pipe))
-      {
-    	  char *new_line;
-	  username[sizeof(username)-1]=0;
-	  if ((new_line = strchr (username, '\n')))
-	    new_line[0] = 0;
-
-	  cout << "found old username " << username << endl;
-
-    	  gContext->SetSetting("Hostfoldingusername", username);
-    	  gContext->SaveSetting("Hostfoldingusername", username);
-      }
-      pclose (username_pipe);
-    }
-
-    HostComboBox *gc = new HostComboBox("Hostfoldingusername",true);
-    gc->setLabel(QObject::tr("Folding Username"));
-    gc->setValue("");
-
-    gc->setHelpText(QObject::tr("The username associated to the work-units you return."));
-    return gc;
-};
-
-static HostComboBox *Hostfoldingworksize()
-{
-    HostComboBox *gc = new HostComboBox("Hostfoldingworksize");
-    gc->setLabel(QObject::tr("Work Packet Size"));
-    gc->addSelection("Big", "big");
-    gc->addSelection("Normal", "normal");
-    gc->addSelection("Small", "small");
-    gc->setHelpText(QObject::tr("Acceptable size of work assignment and work result packets (bigger units may have large memory demands)."));
-    return gc;
-};
-
-static HostCheckBox *HostXscreensaver()
-{
-    HostCheckBox *gc = new HostCheckBox("HostXscreensaver");
-    gc->setLabel(QObject::tr("Screensaver"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Run screensaver after 10 minutes of inactivity."));
-    return gc;
-};
-
-
-static HostCheckBox *Hostpluginmythzoneminder()
-{
-    HostCheckBox *gc = new HostCheckBox("Hostpluginmythzoneminder");
-    gc->setLabel(QObject::tr("mythzoneminder"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("check to enable mythzoneminder"));
-    return gc;
-};
-
-
-// -------------End plugins--------------------------------
-
-
-
-class NCIDsettings: public TriggeredConfigurationGroup {
-public:
-    NCIDsettings():
-        TriggeredConfigurationGroup(false, false, true, true,false, false, true, true) {
-        SetVertical(false);
-        Setting* trigger =  HostncidDaemon() ;
-        addChild(trigger);
-        setTrigger(trigger);
-        ConfigurationGroup* settings = new HorizontalConfigurationGroup(false,false);
-            settings->addChild(HostSerialPortncid());
-        addTarget("0", new HorizontalConfigurationGroup(false, false));
-        addTarget("1", settings);
-    };
-};
-
-class SAMBAsettings: public TriggeredConfigurationGroup {
-public:
-    SAMBAsettings():
-        TriggeredConfigurationGroup(false, true, true, true,false, false, true, true) {
-        SetVertical(false);
-        Setting* trigger =  HostServiceSamba() ;
-        addChild(trigger);
-        setTrigger(trigger);
-
-        ConfigurationGroup* settings = new GridConfigurationGroup(2,false,false);
-                //settings->addChild(HostServiceSamba());
-                settings->addChild(HostServiceSamba_media());
-                settings->addChild(HostServiceSamba_write());
-                settings->addChild(HostServiceSamba_home());
-                settings->addChild(HostServiceSamba_writehome());
-                settings->addChild(HostServiceSamba_domain());
-
-        addTarget("0", new GridConfigurationGroup(2,false, false));
-        addTarget("1", settings);
-    };
-};
-
-
-
-/*
-class LIRCsettings: public TriggeredConfigurationGroup {
-public:
-    LIRCsettings():
-        TriggeredConfigurationGroup(false, false, true, true,false, false, true, true) {
-        //SetVertical(false);
-        setLabel(QObject::tr("Misc Settings"));
-        Setting* trigger =  HostReceiverType() ;
-        addChild(trigger);
-        setTrigger(trigger);
-
-        ConfigurationGroup* settings = new GridConfigurationGroup(2,true);
-        settings->addChild(HostLircWait());
-        settings->addChild(HostSerialPortlirc());
-
-        ConfigurationGroup* settings2 = new VerticalConfigurationGroup(true,true);
-        settings2->addChild(HostLircWait());
-
-        addTarget("Default", settings2);
-        addTarget("Serial", settings);
-        addTarget("Usb", settings2);
-        addTarget("Usb-imon", settings2 );
-        addTarget("Hauppauge",settings2);
-        addTarget("tinker", new VerticalConfigurationGroup(false, false));
-    };
-};*/
-
-class Evroutersettings: public TriggeredConfigurationGroup {
-    public:
-    Evroutersettings():
-        TriggeredConfigurationGroup(false, false, true, true,false, false, true, true) {
-        //SetVertical(false);
-        setLabel(QObject::tr("Evrouter config"));
-        Setting* trigger =  HostRunEvrouter() ;
-        addChild(trigger);
-        setTrigger(trigger);
-
-        ConfigurationGroup* settings = new VerticalConfigurationGroup(false,false);
-        settings->addChild(HostEvrouterConfig());
-
-        addTarget("0", new VerticalConfigurationGroup(false, false));
-        addTarget("1", settings);
-        };
-};
-
-class MythGamesettings: public TriggeredConfigurationGroup {
-    public:
-    MythGamesettings():
-        TriggeredConfigurationGroup(false, false, true, true,false, false, true, true) {
-        //SetVertical(false);
-        //setLabel(QObject::tr("Evrouter config"));
-        Setting* trigger =  Hostpluginmythgame() ;
-        addChild(trigger);
-        setTrigger(trigger);
-
-        ConfigurationGroup* settings = new GridConfigurationGroup(3,true,true);
-        settings->addChild(HostpluginmythgameZsnes());
-        settings->addChild(HostpluginmythgameFceu());
-        settings->addChild(HostpluginmythgameMame());
-        settings->addChild(HostpluginmythgameMednafen());
-        settings->addChild(HostpluginmythgameROMDB());
-
-
-        addTarget("0", new VerticalConfigurationGroup(false, false));
-        addTarget("1", settings);
-        };
-};
-
-
-//____________________________________________________________________________
-class eth0_settings:          public TriggeredConfigurationGroup {
-public:
-    eth0_settings():
-    TriggeredConfigurationGroup(true,false,true,true,false,false,false,true) {
-
-    HostComboBox *HOSTESSIDeth0 = new HostComboBox("HOSTESSIDeth0",true);
-        HOSTESSIDeth0->setLabel(QObject::tr("ESSID"));
-        HOSTESSIDeth0->addSelection("MythVantage");
-        HOSTESSIDeth0->addSelection("home_lan");
-        HOSTESSIDeth0->addSelection("type_it_here");
-        HOSTESSIDeth0->setHelpText(QObject::tr("ESSID"));
-    addChild(HOSTESSIDeth0);
-
-    HostComboBox *HostUseEncryptioneth0 = new HostComboBox("HostUseEncryptioneth0");
-        HostUseEncryptioneth0->setLabel(QObject::tr("Encryption"));
-        HostUseEncryptioneth0->setHelpText(QObject::tr("WPA uses a shared key phrase this is the most secure.  For WEP use the generated key, this type of encryption is not recommended."));
-        HostUseEncryptioneth0->addSelection("none");
-        HostUseEncryptioneth0->addSelection("WPA");
-        HostUseEncryptioneth0->addSelection("WEP");
-
-    Setting*  HostUseEncryption =  HostUseEncryptioneth0;
-        addChild(HostUseEncryption);
-        setTrigger(HostUseEncryption);
-
-    HostLineEdit *Hostkeyeth0 = new HostLineEdit("Hostkeyeth0");
-        Hostkeyeth0->setLabel(QObject::tr("key"));
-        Hostkeyeth0->setHelpText(QObject::tr("Key to use for encryption"));
-
-    ConfigurationGroup* settings = new GridConfigurationGroup(1,false);
-        settings->addChild(Hostkeyeth0);
-    addTarget("none", new GridConfigurationGroup(1,false));
-    addTarget("WPA", settings);
-    addTarget("WEP", settings);
-    };
-};
-
-
-NetworkSettingseth0::NetworkSettingseth0():
-        TriggeredConfigurationGroup(false,false,false,false) {
-        setLabel(QObject::tr("Network Settings"));
-    HostLineEdit  *HostIPeth0 = new HostLineEdit("HostIPeth0");
-    HostIPeth0->setLabel(QObject::tr("Ip address"));
-    HostIPeth0->setValue("192.168.1.12");
-    HostIPeth0->setHelpText(QObject::tr("IP address of the new installation"));
-
-    HostComboBox *HostNETMASKeth0 = new HostComboBox("HostNETMASKeth0");
-        HostNETMASKeth0->setLabel(QObject::tr("Netmask"));
-        HostNETMASKeth0->addSelection("/0     0.0.0.0");
-        HostNETMASKeth0->addSelection("/1     128.0.0.0");
-        HostNETMASKeth0->addSelection("/2     192.0.0.0");
-        HostNETMASKeth0->addSelection("/3     224.0.0.0");
-        HostNETMASKeth0->addSelection("/4     240.0.0.0");
-        HostNETMASKeth0->addSelection("/5     248.0.0.0");
-        HostNETMASKeth0->addSelection("/6     252.0.0.0");
-        HostNETMASKeth0->addSelection("/7     254.0.0.0");
-        HostNETMASKeth0->addSelection("/8     255.0.0.0");
-        HostNETMASKeth0->addSelection("/9     255.128.0.0");
-        HostNETMASKeth0->addSelection("/10    255.192.0.0 ");
-        HostNETMASKeth0->addSelection("/11    255.224.0.0");
-        HostNETMASKeth0->addSelection("/12    255.240.0.0");
-        HostNETMASKeth0->addSelection("/13    255.248.0.0");
-        HostNETMASKeth0->addSelection("/14    255.252.0.0");
-        HostNETMASKeth0->addSelection("/15    255.254.0.0");
-        HostNETMASKeth0->addSelection("/16    255.255.0.0");
-        HostNETMASKeth0->addSelection("/17    255.255.128.0");
-        HostNETMASKeth0->addSelection("/18    255.255.192.0");
-        HostNETMASKeth0->addSelection("/19    255.255.224.0");
-        HostNETMASKeth0->addSelection("/20    255.255.240.0");
-        HostNETMASKeth0->addSelection("/21    255.255.248.0");
-        HostNETMASKeth0->addSelection("/22    255.255.252.0");
-        HostNETMASKeth0->addSelection("/23    255.255.254.0");
-        HostNETMASKeth0->addSelection("/24    255.255.255.0");
-        HostNETMASKeth0->addSelection("/25    255.255.255.128");
-        HostNETMASKeth0->addSelection("/26    255.255.255.192");
-        HostNETMASKeth0->addSelection("/27    255.255.255.224");
-        HostNETMASKeth0->addSelection("/28    255.255.255.240");
-        HostNETMASKeth0->addSelection("/29    255.255.255.248");
-        HostNETMASKeth0->addSelection("/30    255.255.255.252");
-        HostNETMASKeth0->addSelection("/31    255.255.255.254");
-        HostNETMASKeth0->addSelection("/32    255.255.255.255");
-        HostNETMASKeth0->setHelpText(QObject::tr("Netmask"));
-        HostNETMASKeth0->setValue(24);
-
-        HostLineEdit *HostGWeth0 = new HostLineEdit("HostGWeth0");
-        HostGWeth0->setLabel(QObject::tr("Gateway"));
-        HostGWeth0->setValue("192.168.1.1");
-        HostGWeth0->setHelpText(QObject::tr("This is the default route"));
-
-
-        HostLineEdit *HostDNSeth0 = new HostLineEdit("HostDNSeth0");
-        HostDNSeth0->setLabel(QObject::tr("Name server"));
-        HostDNSeth0->setValue("192.168.1.1");
-        HostDNSeth0->setHelpText(QObject::tr("Name server"));
-
-
-        HostCheckBox *HostActiveonbooteth0 = new HostCheckBox("HostActiveonbooteth0");
-        HostActiveonbooteth0->setLabel(QObject::tr("Active"));
-        HostActiveonbooteth0->setValue(true);
-        HostActiveonbooteth0->setHelpText(QObject::tr("Network is started on boot"));
-
-        HostDefaulteth0 = new HostCheckBox("HostDefaulteth0");
-        HostDefaulteth0->setLabel(QObject::tr("Default"));
-        HostDefaulteth0->setValue(true);
-        HostDefaulteth0->setHelpText(QObject::tr("Will be used as the primary interface"));
-        connect(HostDefaulteth0, SIGNAL(valueChanged(bool)), this, SLOT(eth0_disable_others()));
-
-        HostCheckBox *HostUseDHCPeth0 = new HostCheckBox("HostUseDHCPeth0");
-        HostUseDHCPeth0 ->setLabel(QObject::tr("Static ip address"));
-        HostUseDHCPeth0 ->setValue(false);
-        HostUseDHCPeth0 ->setHelpText(QObject::tr("Enable to use a static ip address, otherwise dhcp will be used."));
-
-        wirelessbuttoneth0 = new TransButtonSetting();
-        wirelessbuttoneth0->setLabel(tr("Wireless Settings"));
-        connect(wirelessbuttoneth0, SIGNAL(pressed()), this,   SLOT(eth0_wireless_settings()));
-
-      ConfigurationGroup* settings1 = new GridConfigurationGroup(3,false, false, true, true);
-            settings1->addChild(HostActiveonbooteth0);
-            settings1->addChild(HostDefaulteth0);
-            settings1-> addChild(wirelessbuttoneth0);
-        addChild(settings1);
-
-
-        Setting* dhcpEnabled = HostUseDHCPeth0;
-        addChild(dhcpEnabled);
-        setTrigger(dhcpEnabled);
-
-        ConfigurationGroup* settings = new VerticalConfigurationGroup(false, false, false, false);
-            settings->addChild(HostIPeth0);
-            settings->addChild(HostNETMASKeth0);
-            settings->addChild(HostGWeth0);
-            settings->addChild(HostDNSeth0);
-
-        addTarget("0", new VerticalConfigurationGroup(false,false,false,false));
-        addTarget("1", settings);
-    };
-
-eth0options::eth0options()
-{
-
-    VerticalConfigurationGroup* rec = new VerticalConfigurationGroup(false);
-    rec->setLabel(QObject::tr("Wireless configuration for eth0"));
-    //rec->setUseLabel(true);
-    rec->addChild(new eth0_settings);
-    addChild(rec);
-}
-
-void NetworkSettingseth0::eth0_disable_others()
-{
-        QString my_current_value;
-        my_current_value = HostDefaulteth0->getValue();
-        if ( my_current_value == "1" )
-        {
-            cout <<"ETH0: set other defaults buttons to off"<<endl;
-        hostparm.ThisHostDefaultInterface="eth0";
-            emit eth0_is_default();
-        }
-}
-void NetworkSettingseth0::eth0_disabled()
-{
-    cout << "    eth0 is not default" << endl;
-    HostDefaulteth0->setValue(0);
-}
-void NetworkSettingseth0::eth0_wireless_settings(void)
-{
-    //cout <<"button pressed for eth0"<<endl;
-    eth0options eth0screen;
-    eth0screen.exec();
-}
-
-void NetworkSettingseth0::eth0_wireless_disable()
-{
-    cout << "    eth0 disabling wireless button" << endl;
-    wirelessbuttoneth0->setEnabled(false);
-}
-
-class eth1_settings:          public TriggeredConfigurationGroup {
-public:
-    eth1_settings():
-    TriggeredConfigurationGroup(true,false,true,true,false,false,false,true) {
-
-    HostComboBox *HOSTESSIDeth1 = new HostComboBox("HOSTESSIDeth1",true);
-        HOSTESSIDeth1->setLabel(QObject::tr("ESSID"));
-        HOSTESSIDeth1->addSelection("MythVantage");
-        HOSTESSIDeth1->addSelection("home_lan");
-        HOSTESSIDeth1->addSelection("type_it_here");
-        HOSTESSIDeth1->setHelpText(QObject::tr("ESSID"));
-    addChild(HOSTESSIDeth1);
-    HostComboBox *HostUseEncryptioneth0 = new HostComboBox("HostUseEncryptioneth0");
-        HostUseEncryptioneth0->setLabel(QObject::tr("Encryption"));
-        HostUseEncryptioneth0->setHelpText(QObject::tr("WPA, WEP, none"));
-        HostUseEncryptioneth0->addSelection("none");
-        HostUseEncryptioneth0->addSelection("WPA");
-        HostUseEncryptioneth0->addSelection("WEP");
-
-    Setting*  HostUseEncryption =  HostUseEncryptioneth0;
-        addChild(HostUseEncryption);
-        setTrigger(HostUseEncryption);
-
-    HostLineEdit *Hostkeyeth0 = new HostLineEdit("Hostkeyeth0");
-        Hostkeyeth0->setLabel(QObject::tr("key"));
-        Hostkeyeth0->setHelpText(QObject::tr("Key to use for encryption"));
-
-    ConfigurationGroup* settings = new GridConfigurationGroup(1,false);
-        settings->addChild(Hostkeyeth0);
-    addTarget("none", new GridConfigurationGroup(1,false));
-    addTarget("WPA", settings);
-    addTarget("WEP", settings);
-    //-
-
-
-    };
-};
-
-
-NetworkSettingseth1::NetworkSettingseth1():
-        TriggeredConfigurationGroup(false,false,false,false) {
-    setLabel(QObject::tr("Network Settings"));
-    HostLineEdit  *HostIPeth1 = new HostLineEdit("HostIPeth1");
-    HostIPeth1->setLabel(QObject::tr("Ip address"));
-    HostIPeth1->setValue("192.168.1.12");
-    HostIPeth1->setHelpText(QObject::tr("IP address of the new installation"));
-
-    HostComboBox *HostNETMASKeth1 = new HostComboBox("HostNETMASKeth1");
-        HostNETMASKeth1->setLabel(QObject::tr("Netmask"));
-        HostNETMASKeth1->addSelection("/0     0.0.0.0");
-        HostNETMASKeth1->addSelection("/1     128.0.0.0");
-        HostNETMASKeth1->addSelection("/2     192.0.0.0");
-        HostNETMASKeth1->addSelection("/3     224.0.0.0");
-        HostNETMASKeth1->addSelection("/4     240.0.0.0");
-        HostNETMASKeth1->addSelection("/5     248.0.0.0");
-        HostNETMASKeth1->addSelection("/6     252.0.0.0");
-        HostNETMASKeth1->addSelection("/7     254.0.0.0");
-        HostNETMASKeth1->addSelection("/8     255.0.0.0");
-        HostNETMASKeth1->addSelection("/9     255.128.0.0");
-        HostNETMASKeth1->addSelection("/10    255.192.0.0 ");
-        HostNETMASKeth1->addSelection("/11    255.224.0.0");
-        HostNETMASKeth1->addSelection("/12    255.240.0.0");
-        HostNETMASKeth1->addSelection("/13    255.248.0.0");
-        HostNETMASKeth1->addSelection("/14    255.252.0.0");
-        HostNETMASKeth1->addSelection("/15    255.254.0.0");
-        HostNETMASKeth1->addSelection("/16    255.255.0.0");
-        HostNETMASKeth1->addSelection("/17    255.255.128.0");
-        HostNETMASKeth1->addSelection("/18    255.255.192.0");
-        HostNETMASKeth1->addSelection("/19    255.255.224.0");
-        HostNETMASKeth1->addSelection("/20    255.255.240.0");
-        HostNETMASKeth1->addSelection("/21    255.255.248.0");
-        HostNETMASKeth1->addSelection("/22    255.255.252.0");
-        HostNETMASKeth1->addSelection("/23    255.255.254.0");
-        HostNETMASKeth1->addSelection("/24    255.255.255.0");
-        HostNETMASKeth1->addSelection("/25    255.255.255.128");
-        HostNETMASKeth1->addSelection("/26    255.255.255.192");
-        HostNETMASKeth1->addSelection("/27    255.255.255.224");
-        HostNETMASKeth1->addSelection("/28    255.255.255.240");
-        HostNETMASKeth1->addSelection("/29    255.255.255.248");
-        HostNETMASKeth1->addSelection("/30    255.255.255.252");
-        HostNETMASKeth1->addSelection("/31    255.255.255.254");
-        HostNETMASKeth1->addSelection("/32    255.255.255.255");
-        HostNETMASKeth1->setHelpText(QObject::tr("Netmask"));
-        HostNETMASKeth1->setValue(24);
-
-        HostLineEdit *HostGWeth1 = new HostLineEdit("HostGWeth1");
-        HostGWeth1->setLabel(QObject::tr("Gateway"));
-        HostGWeth1->setValue("192.168.1.1");
-        HostGWeth1->setHelpText(QObject::tr("This is the default route"));
-
-
-        HostLineEdit *HostDNSeth1 = new HostLineEdit("HostDNSeth1");
-        HostDNSeth1->setLabel(QObject::tr("Name server"));
-        HostDNSeth1->setValue("192.168.1.1");
-        HostDNSeth1->setHelpText(QObject::tr("Name server"));
-
-
-        HostCheckBox *HostActiveonbooteth1 = new HostCheckBox("HostActiveonbooteth1");
-        HostActiveonbooteth1->setLabel(QObject::tr("Active"));
-        HostActiveonbooteth1->setValue(false);
-        HostActiveonbooteth1->setHelpText(QObject::tr("Network is started on boot"));
-
-        HostDefaulteth1 = new HostCheckBox("HostDefaulteth1");
-        HostDefaulteth1->setLabel(QObject::tr("Default"));
-        HostDefaulteth1->setValue(false);
-        HostDefaulteth1->setHelpText(QObject::tr("Will be used as the primary interface"));
-        connect(HostDefaulteth1, SIGNAL(valueChanged(bool)), this, SLOT(eth1_disable_others()));
-
-        HostCheckBox *HostUseDHCPeth1 = new HostCheckBox("HostUseDHCPeth1");
-        HostUseDHCPeth1 ->setLabel(QObject::tr("Static ip address"));
-        HostUseDHCPeth1 ->setValue(false);
-        HostUseDHCPeth1 ->setHelpText(QObject::tr("Enable to use a static ip address, otherwise dhcp will be used."));
-
-        wirelessbuttoneth1 = new TransButtonSetting();
-        wirelessbuttoneth1->setLabel(tr("Wireless Settings"));
-        connect(wirelessbuttoneth1, SIGNAL(pressed()), this,   SLOT(eth1_wireless_settings()));
-
-        ConfigurationGroup* settings1 = new GridConfigurationGroup(3,false, false, false,false);
-            settings1->addChild(HostActiveonbooteth1);
-            settings1->addChild(HostDefaulteth1);
-            settings1-> addChild(wirelessbuttoneth1);
-
-        addChild(settings1);
-
-        Setting* dhcpEnabled = HostUseDHCPeth1;
-        addChild(dhcpEnabled);
-        setTrigger(dhcpEnabled);
-
-        ConfigurationGroup* settings = new VerticalConfigurationGroup(false, false,false,false);
-            settings->addChild(HostIPeth1);
-            settings->addChild(HostNETMASKeth1);
-            settings->addChild(HostGWeth1);
-            settings->addChild(HostDNSeth1);
-
-        addTarget("0", new VerticalConfigurationGroup(false,false,false,false));
-        addTarget("1", settings);
-};
-eth1options::eth1options()
-{
-
-    VerticalConfigurationGroup* rec = new VerticalConfigurationGroup(false);
-    rec->setLabel(QObject::tr("Wireless configuration for eth1"));
-    //rec->setUseLabel(true);
-    rec->addChild(new eth1_settings);
-    addChild(rec);
-}
-
-void NetworkSettingseth1::eth1_disable_others()
-{
-        QString my_current_value;
-        my_current_value = HostDefaulteth1->getValue();
-        if ( my_current_value == "1" )
-        {
-            cout <<"ETH1: set other defaults buttons to off"<<endl;
-            hostparm.ThisHostDefaultInterface="eth1";
-            emit eth1_is_default();
-        }
-}
-void NetworkSettingseth1::eth1_disabled()
-{
-    cout << "   eth1 is not default" << endl;
-        HostDefaulteth1->setValue(0);
-}
-
-void NetworkSettingseth1::eth1_wireless_settings(void)
-{
-    //cout <<"button pressed for eth1"<<endl;
-    eth1options eth1screen;
-    eth1screen.exec();
-}
-
-void NetworkSettingseth1::eth1_wireless_disable()
-{
-    cout << "    eth1 disabling wireless button" << endl;
-    wirelessbuttoneth1->setEnabled(false);
-}
-
-
-class wlan0_settings:          public TriggeredConfigurationGroup {
-public:
-    wlan0_settings():
-    TriggeredConfigurationGroup(true,false,true,true,false,false,false,true) {
-
-    HostComboBox *HOSTESSIDwlan0 = new HostComboBox("HOSTESSIDwlan0",true);
-        HOSTESSIDwlan0->setLabel(QObject::tr("ESSID"));
-        HOSTESSIDwlan0->addSelection("MythVantage");
-        HOSTESSIDwlan0->addSelection("home_lan");
-        HOSTESSIDwlan0->addSelection("type_it_here");
-        HOSTESSIDwlan0->setHelpText(QObject::tr("ESSID"));
-    addChild(HOSTESSIDwlan0);
-    HostComboBox *HostUseEncryptionwlan0 = new HostComboBox("HostUseEncryptionwlan0");
-        HostUseEncryptionwlan0->setLabel(QObject::tr("Encryption"));
-        HostUseEncryptionwlan0->setHelpText(QObject::tr("WPA, WEP, none"));
-        HostUseEncryptionwlan0->addSelection("none");
-        HostUseEncryptionwlan0->addSelection("WPA");
-        HostUseEncryptionwlan0->addSelection("WEP");
-
-    Setting*  HostUseEncryption =  HostUseEncryptionwlan0;
-        addChild(HostUseEncryption);
-        setTrigger(HostUseEncryption);
-
-    HostLineEdit *Hostkeywlan0 = new HostLineEdit("Hostkeywlan0");
-        Hostkeywlan0->setLabel(QObject::tr("key"));
-        Hostkeywlan0->setHelpText(QObject::tr("Key to use for encryption"));
-
-    ConfigurationGroup* settings = new GridConfigurationGroup(1,false);
-        settings->addChild(Hostkeywlan0);
-    addTarget("none", new GridConfigurationGroup(1,false));
-    addTarget("WPA", settings);
-    addTarget("WEP", settings);
-    //-
-    };
-};
-
-NetworkSettingswlan0::NetworkSettingswlan0():
-        TriggeredConfigurationGroup(false,false,false,false) {
-        setLabel(QObject::tr("Network Settings"));
-
-    HostIPwlan0 = new HostLineEdit("HostIPwlan0");
-    HostIPwlan0->setLabel(QObject::tr("Ip address"));
-    HostIPwlan0->setValue("192.168.1.12");
-    HostIPwlan0->setHelpText(QObject::tr("IP address of the new installation"));
-
-    HostNETMASKwlan0 = new HostComboBox("HostNETMASKwlan0");
-        HostNETMASKwlan0->setLabel(QObject::tr("Netmask"));
-        HostNETMASKwlan0->addSelection("/0     0.0.0.0");
-        HostNETMASKwlan0->addSelection("/1     128.0.0.0");
-        HostNETMASKwlan0->addSelection("/2     192.0.0.0");
-        HostNETMASKwlan0->addSelection("/3     224.0.0.0");
-        HostNETMASKwlan0->addSelection("/4     240.0.0.0");
-        HostNETMASKwlan0->addSelection("/5     248.0.0.0");
-        HostNETMASKwlan0->addSelection("/6     252.0.0.0");
-        HostNETMASKwlan0->addSelection("/7     254.0.0.0");
-        HostNETMASKwlan0->addSelection("/8     255.0.0.0");
-        HostNETMASKwlan0->addSelection("/9     255.128.0.0");
-        HostNETMASKwlan0->addSelection("/10    255.192.0.0 ");
-        HostNETMASKwlan0->addSelection("/11    255.224.0.0");
-        HostNETMASKwlan0->addSelection("/12    255.240.0.0");
-        HostNETMASKwlan0->addSelection("/13    255.248.0.0");
-        HostNETMASKwlan0->addSelection("/14    255.252.0.0");
-        HostNETMASKwlan0->addSelection("/15    255.254.0.0");
-        HostNETMASKwlan0->addSelection("/16    255.255.0.0");
-        HostNETMASKwlan0->addSelection("/17    255.255.128.0");
-        HostNETMASKwlan0->addSelection("/18    255.255.192.0");
-        HostNETMASKwlan0->addSelection("/19    255.255.224.0");
-        HostNETMASKwlan0->addSelection("/20    255.255.240.0");
-        HostNETMASKwlan0->addSelection("/21    255.255.248.0");
-        HostNETMASKwlan0->addSelection("/22    255.255.252.0");
-        HostNETMASKwlan0->addSelection("/23    255.255.254.0");
-        HostNETMASKwlan0->addSelection("/24    255.255.255.0");
-        HostNETMASKwlan0->addSelection("/25    255.255.255.128");
-        HostNETMASKwlan0->addSelection("/26    255.255.255.192");
-        HostNETMASKwlan0->addSelection("/27    255.255.255.224");
-        HostNETMASKwlan0->addSelection("/28    255.255.255.240");
-        HostNETMASKwlan0->addSelection("/29    255.255.255.248");
-        HostNETMASKwlan0->addSelection("/30    255.255.255.252");
-        HostNETMASKwlan0->addSelection("/31    255.255.255.254");
-        HostNETMASKwlan0->addSelection("/32    255.255.255.255");
-        HostNETMASKwlan0->setHelpText(QObject::tr("Netmask"));
-        HostNETMASKwlan0->setValue(24);
-
-        HostGWwlan0 = new HostLineEdit("HostGWwlan0");
-        HostGWwlan0->setLabel(QObject::tr("Gateway"));
-        HostGWwlan0->setValue("192.168.1.1");
-        HostGWwlan0->setHelpText(QObject::tr("This is the default route"));
-
-
-        HostDNSwlan0 = new HostLineEdit("HostDNSwlan0");
-        HostDNSwlan0->setLabel(QObject::tr("Name server"));
-        HostDNSwlan0->setValue("192.168.1.1");
-        HostDNSwlan0->setHelpText(QObject::tr("Name server"));
-
-
-        HostActiveonbootwlan0 = new HostCheckBox("HostActiveonbootwlan0");
-        HostActiveonbootwlan0->setLabel(QObject::tr("Active"));
-        HostActiveonbootwlan0->setValue(false);
-        HostActiveonbootwlan0->setHelpText(QObject::tr("Network is started on boot"));
-
-        HostDefaultwlan0 = new HostCheckBox("HostDefaultwlan0");
-        HostDefaultwlan0->setLabel(QObject::tr("Default"));
-        HostDefaultwlan0->setValue(false);
-        HostDefaultwlan0->setHelpText(QObject::tr("Will be used as the primary interface"));
-        connect(HostDefaultwlan0, SIGNAL(valueChanged(bool)), this, SLOT(wlan0_disable_others()));
-
-
-
-        HostUseDHCPwlan0 = new HostCheckBox("HostUseDHCPwlan0");
-        HostUseDHCPwlan0 ->setLabel(QObject::tr("Static ip address"));
-        HostUseDHCPwlan0 ->setValue(false);
-        HostUseDHCPwlan0 ->setHelpText(QObject::tr("Enable to use a static ip address, otherwise dhcp will be used."));
-
-        wirelessbuttonwlan0 = new TransButtonSetting();
-        wirelessbuttonwlan0->setLabel(tr("Wireless Settings"));
-        connect(wirelessbuttonwlan0, SIGNAL(pressed()), this,   SLOT(wlan0_wireless_settings()));
-
-
-        ConfigurationGroup* settings1 = new GridConfigurationGroup(3,false, false, false,false);
-            settings1->addChild(HostActiveonbootwlan0);
-            settings1->addChild(HostDefaultwlan0);
-            settings1-> addChild(wirelessbuttonwlan0);
-        addChild(settings1);
-
-        Setting* dhcpEnabled = HostUseDHCPwlan0;
-        addChild(dhcpEnabled);
-        setTrigger(dhcpEnabled);
-
-        ConfigurationGroup* settings = new VerticalConfigurationGroup(false, false,false,false);
-            settings->addChild(HostIPwlan0);
-            settings->addChild(HostNETMASKwlan0);
-            settings->addChild(HostGWwlan0);
-            settings->addChild(HostDNSwlan0);
-
-        addTarget("0", new VerticalConfigurationGroup(false,false,false,false));
-        addTarget("1", settings);
-
-};
-
-Wlan0options::Wlan0options()
-{
-
-    VerticalConfigurationGroup* rec = new VerticalConfigurationGroup(false);
-    rec->setLabel(QObject::tr("Wireless configuration for wlan0"));
-    //rec->setUseLabel(true);
-    rec->addChild(new wlan0_settings);
-    addChild(rec);
-}
-
-void NetworkSettingswlan0::wlan0_disable_others()
-{
-        QString my_current_value;
-        my_current_value = HostDefaultwlan0->getValue();
-        if ( my_current_value == "1" )
-        {
-            cout <<"WLAN0: set other defaults buttons to off"<<endl;
-        hostparm.ThisHostDefaultInterface="wlan0";
-            emit wlan0_is_default();
-        }
-
-
-
-}
-void NetworkSettingswlan0::wlan0_disabled()
-{
-    cout << "   wlan0 is not default" << endl;
-    HostDefaultwlan0->setValue(0);
-}
-
-
-void NetworkSettingswlan0::wlan0_wireless_settings(void)
-{
-    //cout <<"button pressed for wlan0"<<endl;
-    Wlan0options wlan0screen;
-    wlan0screen.exec();
-}
-void NetworkSettingswlan0::wlan0_wireless_disable()
-{
-    cout << "    wlan0 disabling wireless button" << endl;
-    wirelessbuttonwlan0->setEnabled(false);
-}
-
-
-class wlan1_settings:          public TriggeredConfigurationGroup {
-public:
-    wlan1_settings():
-    TriggeredConfigurationGroup(true,false,true,true,false,false,false,true) {
-
-    HostComboBox *HOSTESSIDwlan1 = new HostComboBox("HOSTESSIDwlan1",true);
-        HOSTESSIDwlan1->setLabel(QObject::tr("ESSID"));
-        HOSTESSIDwlan1->addSelection("MythVantage");
-        HOSTESSIDwlan1->addSelection("home_lan");
-        HOSTESSIDwlan1->addSelection("type_it_here");
-        HOSTESSIDwlan1->setHelpText(QObject::tr("ESSID"));
-    addChild(HOSTESSIDwlan1);
-
-
-    HostComboBox *HostUseEncryptionwlan1 = new HostComboBox("HostUseEncryptionwlan1");
-        HostUseEncryptionwlan1->setLabel(QObject::tr("Encryption"));
-        HostUseEncryptionwlan1->setHelpText(QObject::tr("WPA, WEP, none"));
-        HostUseEncryptionwlan1->addSelection("none");
-        HostUseEncryptionwlan1->addSelection("WPA");
-        HostUseEncryptionwlan1->addSelection("WEP");
-
-    Setting*  HostUseEncryption =  HostUseEncryptionwlan1;
-        addChild(HostUseEncryption);
-        setTrigger(HostUseEncryption);
-
-    HostLineEdit *Hostkeywlan1 = new HostLineEdit("Hostkeywlan1");
-        Hostkeywlan1->setLabel(QObject::tr("key"));
-        Hostkeywlan1->setHelpText(QObject::tr("Key to use for encryption"));
-
-    ConfigurationGroup* settings = new GridConfigurationGroup(1,false);
-        settings->addChild(Hostkeywlan1);
-    addTarget("none", new GridConfigurationGroup(1,false));
-    addTarget("WPA", settings);
-    addTarget("WEP", settings);
-    //-
-    };
-};
-
-NetworkSettingswlan1::NetworkSettingswlan1():
-        TriggeredConfigurationGroup(false,false,false,false) {
-        setLabel(QObject::tr("Network Settings"));
-
-    HostIPwlan1 = new HostLineEdit("HostIPwlan1");
-    HostIPwlan1->setLabel(QObject::tr("Ip address"));
-    HostIPwlan1->setValue("192.168.1.12");
-    HostIPwlan1->setHelpText(QObject::tr("IP address of the new installation"));
-
-    HostNETMASKwlan1 = new HostComboBox("HostNETMASKwlan1");
-        HostNETMASKwlan1->setLabel(QObject::tr("Netmask"));
-        HostNETMASKwlan1->addSelection("/0     0.0.0.0");
-        HostNETMASKwlan1->addSelection("/1     128.0.0.0");
-        HostNETMASKwlan1->addSelection("/2     192.0.0.0");
-        HostNETMASKwlan1->addSelection("/3     224.0.0.0");
-        HostNETMASKwlan1->addSelection("/4     240.0.0.0");
-        HostNETMASKwlan1->addSelection("/5     248.0.0.0");
-        HostNETMASKwlan1->addSelection("/6     252.0.0.0");
-        HostNETMASKwlan1->addSelection("/7     254.0.0.0");
-        HostNETMASKwlan1->addSelection("/8     255.0.0.0");
-        HostNETMASKwlan1->addSelection("/9     255.128.0.0");
-        HostNETMASKwlan1->addSelection("/10    255.192.0.0 ");
-        HostNETMASKwlan1->addSelection("/11    255.224.0.0");
-        HostNETMASKwlan1->addSelection("/12    255.240.0.0");
-        HostNETMASKwlan1->addSelection("/13    255.248.0.0");
-        HostNETMASKwlan1->addSelection("/14    255.252.0.0");
-        HostNETMASKwlan1->addSelection("/15    255.254.0.0");
-        HostNETMASKwlan1->addSelection("/16    255.255.0.0");
-        HostNETMASKwlan1->addSelection("/17    255.255.128.0");
-        HostNETMASKwlan1->addSelection("/18    255.255.192.0");
-        HostNETMASKwlan1->addSelection("/19    255.255.224.0");
-        HostNETMASKwlan1->addSelection("/20    255.255.240.0");
-        HostNETMASKwlan1->addSelection("/21    255.255.248.0");
-        HostNETMASKwlan1->addSelection("/22    255.255.252.0");
-        HostNETMASKwlan1->addSelection("/23    255.255.254.0");
-        HostNETMASKwlan1->addSelection("/24    255.255.255.0");
-        HostNETMASKwlan1->addSelection("/25    255.255.255.128");
-        HostNETMASKwlan1->addSelection("/26    255.255.255.192");
-        HostNETMASKwlan1->addSelection("/27    255.255.255.224");
-        HostNETMASKwlan1->addSelection("/28    255.255.255.240");
-        HostNETMASKwlan1->addSelection("/29    255.255.255.248");
-        HostNETMASKwlan1->addSelection("/30    255.255.255.252");
-        HostNETMASKwlan1->addSelection("/31    255.255.255.254");
-        HostNETMASKwlan1->addSelection("/32    255.255.255.255");
-        HostNETMASKwlan1->setHelpText(QObject::tr("Netmask"));
-        HostNETMASKwlan1->setValue(24);
-
-        HostGWwlan1 = new HostLineEdit("HostGWwlan1");
-        HostGWwlan1->setLabel(QObject::tr("Gateway"));
-        HostGWwlan1->setValue("192.168.1.1");
-        HostGWwlan1->setHelpText(QObject::tr("This is the default route"));
-
-
-        HostDNSwlan1 = new HostLineEdit("HostDNSwlan1");
-        HostDNSwlan1->setLabel(QObject::tr("Name server"));
-        HostDNSwlan1->setValue("192.168.1.1");
-        HostDNSwlan1->setHelpText(QObject::tr("Name server"));
-
-
-        HostActiveonbootwlan1 = new HostCheckBox("HostActiveonbootwlan1");
-        HostActiveonbootwlan1->setLabel(QObject::tr("Active"));
-        HostActiveonbootwlan1->setValue(false);
-        HostActiveonbootwlan1->setHelpText(QObject::tr("Network is started on boot"));
-
-        HostUseDHCPwlan1 = new HostCheckBox("HostUseDHCPwlan1");
-        HostUseDHCPwlan1 ->setLabel(QObject::tr("Static ip address"));
-        HostUseDHCPwlan1 ->setValue(false);
-        HostUseDHCPwlan1 ->setHelpText(QObject::tr("Enable to use a static ip address, otherwise dhcp will be used."));
-
-        wirelessbuttonwlan1 = new TransButtonSetting();
-        wirelessbuttonwlan1->setLabel(tr("Wireless Settings"));
-        connect(wirelessbuttonwlan1, SIGNAL(pressed()), this,   SLOT(wlan1_wireless_settings()));
-
-        HostDefaultwlan1 = new HostCheckBox("HostDefaultwlan1");
-        HostDefaultwlan1->setLabel(QObject::tr("Default"));
-        HostDefaultwlan1->setValue(false);
-        HostDefaultwlan1->setHelpText(QObject::tr("Will be used as the primary interface"));
-        connect(HostDefaultwlan1, SIGNAL(valueChanged(bool)), this, SLOT(wlan1_disable_others()));
-
-
-        ConfigurationGroup* settings1 = new GridConfigurationGroup(3,false, false, false, false);
-            settings1->addChild(HostActiveonbootwlan1);
-            settings1->addChild(HostDefaultwlan1);
-            settings1-> addChild(wirelessbuttonwlan1);
-
-        addChild(settings1);
-
-        Setting* dhcpEnabled = HostUseDHCPwlan1;
-        addChild(dhcpEnabled);
-        setTrigger(dhcpEnabled);
-
-        ConfigurationGroup* settings = new VerticalConfigurationGroup(false, false,false,false);
-            settings->addChild(HostIPwlan1);
-            settings->addChild(HostNETMASKwlan1);
-            settings->addChild(HostGWwlan1);
-            settings->addChild(HostDNSwlan1);
-
-        addTarget("0", new VerticalConfigurationGroup(true));
-        addTarget("1", settings);
-
-};
-
-wlan1options::wlan1options()
-{
-    VerticalConfigurationGroup* rec = new VerticalConfigurationGroup(false);
-    rec->setLabel(QObject::tr("Wireless configuration for wlan1"));
-    //rec->setUseLabel(true);
-    rec->addChild(new wlan1_settings);
-    addChild(rec);
-}
-void NetworkSettingswlan1::wlan1_disable_others()
-{
-        QString my_current_value;
-        my_current_value = HostDefaultwlan1->getValue();
-        if ( my_current_value == "1" )
-        {
-            cout <<"WLAN1:  set other defaults buttons to off"<<endl;
-        hostparm.ThisHostDefaultInterface="wlan1";
-            emit wlan1_is_default();
-        }
-}
-
-void NetworkSettingswlan1::wlan1_disabled()
-{
-    cout << "   wlan1 is not default" << endl;
-    HostDefaultwlan1->setValue(0);
-
-
-}
-void NetworkSettingswlan1::wlan1_wireless_disable()
-{
-    cout << "    wlan1 disabling wireless button" << endl;
-    wirelessbuttonwlan1->setEnabled(false);
-}
-
-void NetworkSettingswlan1::wlan1_wireless_settings(void)
-{
-//  cout <<"button pressed for wlan1"<<endl;
-    wlan1options wlan1screen;
-    wlan1screen.exec();
-}
-
-//---
-
-class ath0_settings:          public TriggeredConfigurationGroup {
-public:
-    ath0_settings():
-    TriggeredConfigurationGroup(true,false,true,true,false,false,false,true) {
-
-    HostComboBox *HOSTESSIDath0 = new HostComboBox("HOSTESSIDath0",true);
-        HOSTESSIDath0->setLabel(QObject::tr("ESSID"));
-        HOSTESSIDath0->addSelection("MythVantage");
-        HOSTESSIDath0->addSelection("home_lan");
-        HOSTESSIDath0->addSelection("type_it_here");
-        HOSTESSIDath0->setHelpText(QObject::tr("ESSID"));
-    addChild(HOSTESSIDath0);
-
-        HostComboBox *HostUseEncryptionath0 = new HostComboBox("HostUseEncryptionath0");
-        HostUseEncryptionath0->setLabel(QObject::tr("Encryption"));
-        HostUseEncryptionath0->setHelpText(QObject::tr("WPA, WEP, none"));
-        HostUseEncryptionath0->addSelection("none");
-        HostUseEncryptionath0->addSelection("WPA");
-        HostUseEncryptionath0->addSelection("WEP");
-
-    Setting*  HostUseEncryption =  HostUseEncryptionath0;
-        addChild(HostUseEncryption);
-        setTrigger(HostUseEncryption);
-
-    HostLineEdit *Hostkeyath0 = new HostLineEdit("Hostkeyath0");
-        Hostkeyath0->setLabel(QObject::tr("key"));
-        Hostkeyath0->setHelpText(QObject::tr("Key to use for encryption"));
-
-    ConfigurationGroup* settings = new GridConfigurationGroup(1,false);
-        settings->addChild(Hostkeyath0);
-    addTarget("none", new GridConfigurationGroup(1,false));
-    addTarget("WPA", settings);
-    addTarget("WEP", settings);
-    //-
-
-    };
-};
-
-
-NetworkSettingsath0::NetworkSettingsath0():
-        TriggeredConfigurationGroup(false,false,false,false) {
-    setLabel(QObject::tr("Network Settings"));
-    HostLineEdit  *HostIPath0 = new HostLineEdit("HostIPath0");
-    HostIPath0->setLabel(QObject::tr("Ip address"));
-    HostIPath0->setValue("192.168.1.12");
-    HostIPath0->setHelpText(QObject::tr("IP address of the new installation"));
-
-    HostComboBox *HostNETMASKath0 = new HostComboBox("HostNETMASKath0");
-        HostNETMASKath0->setLabel(QObject::tr("Netmask"));
-        HostNETMASKath0->addSelection("/0     0.0.0.0");
-        HostNETMASKath0->addSelection("/1     128.0.0.0");
-        HostNETMASKath0->addSelection("/2     192.0.0.0");
-        HostNETMASKath0->addSelection("/3     224.0.0.0");
-        HostNETMASKath0->addSelection("/4     240.0.0.0");
-        HostNETMASKath0->addSelection("/5     248.0.0.0");
-        HostNETMASKath0->addSelection("/6     252.0.0.0");
-        HostNETMASKath0->addSelection("/7     254.0.0.0");
-        HostNETMASKath0->addSelection("/8     255.0.0.0");
-        HostNETMASKath0->addSelection("/9     255.128.0.0");
-        HostNETMASKath0->addSelection("/10    255.192.0.0 ");
-        HostNETMASKath0->addSelection("/11    255.224.0.0");
-        HostNETMASKath0->addSelection("/12    255.240.0.0");
-        HostNETMASKath0->addSelection("/13    255.248.0.0");
-        HostNETMASKath0->addSelection("/14    255.252.0.0");
-        HostNETMASKath0->addSelection("/15    255.254.0.0");
-        HostNETMASKath0->addSelection("/16    255.255.0.0");
-        HostNETMASKath0->addSelection("/17    255.255.128.0");
-        HostNETMASKath0->addSelection("/18    255.255.192.0");
-        HostNETMASKath0->addSelection("/19    255.255.224.0");
-        HostNETMASKath0->addSelection("/20    255.255.240.0");
-        HostNETMASKath0->addSelection("/21    255.255.248.0");
-        HostNETMASKath0->addSelection("/22    255.255.252.0");
-        HostNETMASKath0->addSelection("/23    255.255.254.0");
-        HostNETMASKath0->addSelection("/24    255.255.255.0");
-        HostNETMASKath0->addSelection("/25    255.255.255.128");
-        HostNETMASKath0->addSelection("/26    255.255.255.192");
-        HostNETMASKath0->addSelection("/27    255.255.255.224");
-        HostNETMASKath0->addSelection("/28    255.255.255.240");
-        HostNETMASKath0->addSelection("/29    255.255.255.248");
-        HostNETMASKath0->addSelection("/30    255.255.255.252");
-        HostNETMASKath0->addSelection("/31    255.255.255.254");
-        HostNETMASKath0->addSelection("/32    255.255.255.255");
-        HostNETMASKath0->setHelpText(QObject::tr("Netmask"));
-        HostNETMASKath0->setValue(24);
-
-        HostLineEdit *HostGWath0 = new HostLineEdit("HostGWath0");
-        HostGWath0->setLabel(QObject::tr("Gateway"));
-        HostGWath0->setValue("192.168.1.1");
-        HostGWath0->setHelpText(QObject::tr("This is the default route"));
-
-
-        HostLineEdit *HostDNSath0 = new HostLineEdit("HostDNSath0");
-        HostDNSath0->setLabel(QObject::tr("Name server"));
-        HostDNSath0->setValue("192.168.1.1");
-        HostDNSath0->setHelpText(QObject::tr("Name server"));
-
-
-        HostCheckBox *HostActiveonbootath0 = new HostCheckBox("HostActiveonbootath0");
-        HostActiveonbootath0->setLabel(QObject::tr("Active"));
-        HostActiveonbootath0->setValue(false);
-        HostActiveonbootath0->setHelpText(QObject::tr("Network is started on boot"));
-
-        HostDefaultath0 = new HostCheckBox("HostDefaultath0");
-        HostDefaultath0->setLabel(QObject::tr("Default"));
-        HostDefaultath0->setValue(false);
-        HostDefaultath0->setHelpText(QObject::tr("Will be used as the primary interface"));
-        connect(HostDefaultath0, SIGNAL(valueChanged(bool)), this, SLOT(ath0_disable_others()));
-
-        HostCheckBox *HostUseDHCPath0 = new HostCheckBox("HostUseDHCPath0");
-        HostUseDHCPath0 ->setLabel(QObject::tr("Static ip address"));
-        HostUseDHCPath0 ->setValue(false);
-        HostUseDHCPath0 ->setHelpText(QObject::tr("Enable to use a static ip address, otherwise dhcp will be used."));
-
-        wirelessbuttonath0 = new TransButtonSetting();
-        wirelessbuttonath0->setLabel(tr("Wireless Settings"));
-        connect(wirelessbuttonath0, SIGNAL(pressed()), this,   SLOT(ath0_wireless_settings()));
-
-        ConfigurationGroup* settings1 = new GridConfigurationGroup(3,false, false, false,false);
-            settings1->addChild(HostActiveonbootath0);
-            settings1->addChild(HostDefaultath0);
-            settings1-> addChild(wirelessbuttonath0);
-
-        addChild(settings1);
-
-        Setting* dhcpEnabled = HostUseDHCPath0;
-        addChild(dhcpEnabled);
-        setTrigger(dhcpEnabled);
-
-        ConfigurationGroup* settings = new VerticalConfigurationGroup(false, false,false,false);
-            settings->addChild(HostIPath0);
-            settings->addChild(HostNETMASKath0);
-            settings->addChild(HostGWath0);
-            settings->addChild(HostDNSath0);
-
-        addTarget("0", new VerticalConfigurationGroup(false,false,false,false));
-        addTarget("1", settings);
-};
-ath0options::ath0options()
-{
-
-    VerticalConfigurationGroup* rec = new VerticalConfigurationGroup(false);
-    rec->setLabel(QObject::tr("Wireless configuration for ath0"));
-    //rec->setUseLabel(true);
-    rec->addChild(new ath0_settings);
-    addChild(rec);
-}
-
-void NetworkSettingsath0::ath0_disable_others()
-{
-        QString my_current_value;
-        my_current_value = HostDefaultath0->getValue();
-        if ( my_current_value == "1" )
-        {
-            cout <<"ATH0: set other defaults buttons to off"<<endl;
-            hostparm.ThisHostDefaultInterface="ath0";
-            emit ath0_is_default();
-        }
-}
-void NetworkSettingsath0::ath0_disabled()
-{
-    cout << "   ath0 is not default" << endl;
-        HostDefaultath0->setValue(0);
-}
-
-void NetworkSettingsath0::ath0_wireless_settings(void)
-{
-    //cout <<"button pressed for ath0"<<endl;
-    ath0options ath0screen;
-    ath0screen.exec();
-}
-
-void NetworkSettingsath0::ath0_wireless_disable()
-{
-    cout << "    ath0 disabling wireless button" << endl;
-    wirelessbuttonath0->setEnabled(false);
-}
-
-
-//--
-
-class NetworkSettingsFrame:
-                    public TriggeredConfigurationGroup {
-public:
-    NetworkSettingsFrame():
-    TriggeredConfigurationGroup(false, false, true, true,false, false, true, true) {
-        setLabel(QObject::tr("Network Settings Page (2/2)"));
-        Setting* netdevice = HostNetDevice();
-        addChild(netdevice);
-        setTrigger(netdevice);
-
-        NetworkSettingswlan0 *Nwlan0 = new NetworkSettingswlan0 ;
-        NetworkSettingswlan1 *Nwlan1 = new NetworkSettingswlan1 ;
-        NetworkSettingseth0 *Neth0 = new NetworkSettingseth0 ;
-        NetworkSettingseth1 *Neth1 = new NetworkSettingseth1 ;
-        NetworkSettingsath0 *Nath0 = new NetworkSettingsath0 ;
-
-        QString found_wireless=findnet_wireless();
-
-        if ( not found_wireless.contains("eth0"))
-        {
-            Neth0->eth0_wireless_disable();
-            hostparm.ThisHOST_iswirelesseth0="0";
-        }
-        else
-        {
-            hostparm.ThisHOST_iswirelesseth0="1";
-        }
-
-        if ( not found_wireless.contains("eth1"))
-        {
-            Neth1->eth1_wireless_disable();
-            hostparm.ThisHOST_iswirelesseth1="0";
-        }
-        else
-        {
-            hostparm.ThisHOST_iswirelesseth1="1";
-        }
-
-        if ( not found_wireless.contains("wlan0"))
-        {
-            Nwlan0->wlan0_wireless_disable();
-            hostparm.ThisHOST_iswirelesswlan0="0";
-        }
-        else
-        {
-            hostparm.ThisHOST_iswirelesswlan0="1";
-        }
-
-        if ( not found_wireless.contains("wlan1"))
-        {
-            Nwlan1->wlan1_wireless_disable();
-            hostparm.ThisHOST_iswirelesswlan1="0";
-        }
-        else
-        {
-            hostparm.ThisHOST_iswirelesswlan0="1";
-        }
-
-        if ( not found_wireless.contains("ath0"))
-        {
-            Nath0->ath0_wireless_disable();
-            hostparm.ThisHOST_iswirelessath0="0";
-        }
-        else
-        {
-            hostparm.ThisHOST_iswirelessath0="1";
-        }
-        connect(Nwlan1, SIGNAL(wlan1_is_default(void)), Nwlan0,  SLOT(wlan0_disabled()));
-        connect(Nwlan1, SIGNAL(wlan1_is_default(void)), Neth0,   SLOT(eth0_disabled()));
-        connect(Nwlan1, SIGNAL(wlan1_is_default(void)), Neth1,   SLOT(eth1_disabled()));
-        connect(Nwlan1, SIGNAL(wlan1_is_default(void)), Nath0,   SLOT(ath0_disabled()));
-
-        connect(Nwlan0, SIGNAL(wlan0_is_default(void)), Nwlan1,  SLOT(wlan1_disabled()));
-        connect(Nwlan0, SIGNAL(wlan0_is_default(void)), Neth0,   SLOT(eth0_disabled()));
-        connect(Nwlan0, SIGNAL(wlan0_is_default(void)), Neth1,   SLOT(eth1_disabled()));
-        connect(Nwlan0, SIGNAL(wlan0_is_default(void)), Nath0,   SLOT(ath0_disabled()));
-
-        connect(Neth1, SIGNAL(eth1_is_default(void)), Nwlan1,   SLOT(wlan1_disabled()));
-        connect(Neth1, SIGNAL(eth1_is_default(void)), Nwlan0,   SLOT(wlan0_disabled()));
-        connect(Neth1, SIGNAL(eth1_is_default(void)), Neth0,    SLOT(eth0_disabled()));
-        connect(Neth1, SIGNAL(eth1_is_default(void)), Nath0,    SLOT(ath0_disabled()));
-
-        connect(Neth0, SIGNAL(eth0_is_default(void)), Nwlan0,   SLOT(wlan0_disabled()));
-        connect(Neth0, SIGNAL(eth0_is_default(void)), Nwlan1,   SLOT(wlan1_disabled()));
-        connect(Neth0, SIGNAL(eth0_is_default(void)), Neth1,    SLOT(eth1_disabled()));
-        connect(Neth0, SIGNAL(eth0_is_default(void)), Nath0,    SLOT(ath0_disabled()));
-
-        connect(Nath0, SIGNAL(ath0_is_default(void)), Nwlan0,   SLOT(wlan0_disabled()));
-        connect(Nath0, SIGNAL(ath0_is_default(void)), Nwlan1,   SLOT(wlan1_disabled()));
-        connect(Nath0, SIGNAL(ath0_is_default(void)), Neth1,    SLOT(eth1_disabled()));
-        connect(Nath0, SIGNAL(ath0_is_default(void)), Neth0,    SLOT(eth0_disabled()));
-
-
-        HostLineEdit *HostMTUeth0 = new HostLineEdit("HostMTUeth0");
-        HostMTUeth0->setLabel(QObject::tr("MTU"));
-        HostMTUeth0->setValue("");
-        HostMTUeth0->setHelpText(QObject::tr("Leave this blank for default values.  Changing this setting can have adverse affects, use with caution. Not all values will be supported by the device."));
-
-        ConfigurationGroup* settingseth0 = new GridConfigurationGroup(1,false, false, false, false);
-            settingseth0->addChild(Neth0);
-            settingseth0->addChild(HostMTUeth0);
-
-
-        HostLineEdit *HostMTUeth1 = new HostLineEdit("HostMTUeth1");
-        HostMTUeth1->setLabel(QObject::tr("MTU"));
-        HostMTUeth1->setValue("");
-        HostMTUeth1->setHelpText(QObject::tr("Leave this blank for default values.  Changing this setting can have adverse affects, use with caution.  Not all values will be supported by the device."));
-
-        ConfigurationGroup* settingseth1 = new GridConfigurationGroup(1,false, false, true, true);
-            settingseth1->addChild(Neth1);
-            settingseth1->addChild(HostMTUeth1);
-
-        HostLineEdit *HostMTUwlan0 = new HostLineEdit("HostMTUwlan0");
-        HostMTUwlan0->setLabel(QObject::tr("MTU"));
-        HostMTUwlan0->setValue("");
-        HostMTUwlan0->setHelpText(QObject::tr("Leave this blank for default values.  Changing this setting can have adverse affects, use with caution. Not all values will be supported by the device."));
-
-        ConfigurationGroup* settingswlan0 = new GridConfigurationGroup(1,false, false, false, false);
-            settingswlan0->addChild(Nwlan0);
-            settingswlan0->addChild(HostMTUwlan0);
-
-        HostLineEdit *HostMTUwlan1 = new HostLineEdit("HostMTUwlan1");
-        HostMTUwlan1->setLabel(QObject::tr("MTU"));
-        HostMTUwlan1->setValue("");
-        HostMTUwlan1->setHelpText(QObject::tr("Leave this blank for default values.  Changing this setting can have adverse affects, use with caution.  Not all values will be supported by the device."));
-
-        ConfigurationGroup* settingswlan1 = new GridConfigurationGroup(1,false, false, false, false);
-            settingswlan1->addChild(Nwlan1);
-            settingswlan1->addChild(HostMTUwlan1);
-
-        HostLineEdit *HostMTUath0 = new HostLineEdit("HostMTUath0");
-        HostMTUath0->setLabel(QObject::tr("MTU"));
-        HostMTUath0->setValue("");
-        HostMTUath0->setHelpText(QObject::tr("Leave this blank for default values.  Changing this setting can have adverse affects, use with caution.  Not all values will be supported by the device."));
-
-        ConfigurationGroup* settingsath0 = new GridConfigurationGroup(1,false, false, false, false);
-            settingsath0->addChild(Nath0);
-            settingsath0->addChild(HostMTUath0);
-
-
-
-        addTarget("wlan0", settingswlan0);
-        addTarget("wlan1", settingswlan1);
-        addTarget("eth0",  settingseth0);
-        addTarget("eth1",  settingseth1);
-        addTarget("ath0",  settingsath0);
-    };
-};
-
-
-static HostCheckBox *HostAutodown()
-{
-    HostCheckBox *gc = new HostCheckBox("HostAutodown");
-    gc->setLabel(QObject::tr("Turn off machine at a specified time"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Will turn off this system."));
-    return gc;
-};
-
-
-static HostSpinBox *HostWakeupTime()
-{
-    HostSpinBox *gc = new HostSpinBox("HostWakeupTime", -1, 23, 1, true);
-    gc->setLabel(QObject::tr("Power on  time"));
-    gc->setValue(6);
-    gc->setHelpText(QObject::tr("Select the hour to auto poweron this system. Use -1 to disable"  ));
-    return gc;
-}
-
-
-
-static HostSpinBox *HostShutdownTime()
-{
-    HostSpinBox *gc = new HostSpinBox("HostShutdownTime", -1, 23, 1, true);
-    gc->setLabel(QObject::tr("Auto Shutdown time"));
-    gc->setValue(2);
-    gc->setHelpText(QObject::tr("Select the hour to  poweroff this syste.  Times are in 24hour format.  Use -1 to disable"  ));
-    return gc;
-}
-static HostSpinBox *HostShutdownTime2()
-{
-    HostSpinBox *gc = new HostSpinBox("HostShutdownTime2", -1, 23, 1, true);
-    gc->setLabel(QObject::tr("2nd auto Shutdown time"));
-    gc->setValue(2);
-    gc->setHelpText(QObject::tr("Select the hour to  poweroff this syste.  Times are in 24hour format.  Use -1 to disable"  ));
-    return gc;
-}
-
-
-
-static HostCheckBox *HostUseWOL()
-{
-    HostCheckBox *gc = new HostCheckBox("HostUseWOL");
-    gc->setLabel(QObject::tr("Use Wake on Lan to turn on system"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("Unless you know what your doing leave it checked"));
-    return gc;
-};
-
-static HostCheckBox *HostUseNVRAM()
-{
-    HostCheckBox *gc = new HostCheckBox("HostUseNVRAM");
-    gc->setLabel(QObject::tr("Use nvram to turn on system"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("Leaved checked unless nvram causes problems."));
-    return gc;
-};
-
-
-
-
-
-class WakeSettings:                     public TriggeredConfigurationGroup {
-public:
-    WakeSettings():
-
-        TriggeredConfigurationGroup(true) {
-        setLabel(QObject::tr("Shutdown Settings"));
-        Setting* Autodown = HostAutodown();
-        addChild(Autodown);
-        setTrigger(Autodown);
-        ConfigurationGroup* settings = new VerticalConfigurationGroup(false);
-            settings->addChild(HostShutdownTime());
-            settings->addChild(HostShutdownTime2());
-            settings->addChild(HostWakeupTime());
-            settings->addChild(HostUseNVRAM());
-            settings->addChild(HostUseWOL());
-        addTarget("0", new VerticalConfigurationGroup(true));
-        addTarget("1", settings);
-
-    };
-};
-
-class Frontend_settings_group:          public TriggeredConfigurationGroup {
-public:
-    Frontend_settings_group():
-        TriggeredConfigurationGroup(true,false,true,true,false,false,false,true) {
-        Setting* fe = HostRunFrontend();
-        addChild(fe);
-        setTrigger(fe);
-    //HostXres = new HostComboBox("HostXres");
-    ConfigurationGroup* setting1 = new GridConfigurationGroup(2,false);
-            setting1->addChild(HostXres());
-            setting1->addChild(HostUsemythfrontend());
-
-    ConfigurationGroup* settings = new VerticalConfigurationGroup(false);
-            settings->addChild(setting1);
-            settings->addChild(new HostRemoteType);
-
-    addTarget("0", new VerticalConfigurationGroup(false));
-    addTarget("1", settings);
-
-    };
-};
-
-SystemtypeGroup::SystemtypeGroup():        TriggeredConfigurationGroup(true,true,true,true,true,true,true,true) {
-        setLabel(QObject::tr("System Type"));
-        HostSystemType = new HostComboBox("HostSystemType");
-        HostSystemType->setLabel(QObject::tr("Type of system setup"));
-        HostSystemType->addSelection("Standalone");
-        HostSystemType->addSelection("Frontend_only");
-        HostSystemType->addSelection("Master_backend");
-        HostSystemType->addSelection("Slave_backend");
-
-// HostXres = new HostComboBox("HostXres");
-        if ( ((gContext->GetSetting("HostaccesshostypeSystemtype")) == "0" ))
-            HostSystemType->setEnabled(false);
-
-        addChild(HostSystemType);
-        setTrigger(HostSystemType);
-
-        ConfigurationGroup* standalone = new VerticalConfigurationGroup(false,false,true,true);
-            standalone->addChild(HostXres());
-            standalone->addChild(new HostRemoteType);
-            standalone->addChild(HostUsemythfrontend());
-
-        ConfigurationGroup* frontend = new VerticalConfigurationGroup(false,false,true,true);
-            frontend->addChild(HostMysqlserverip_listbox());
-            frontend->addChild(HostXres());
-            frontend->addChild(new HostRemoteType);
-            frontend->addChild(HostUsemythfrontend());
-
-        ConfigurationGroup* backend = new VerticalConfigurationGroup(false,false,false,false);
-            backend->addChild( new Frontend_settings_group);
-
-        ConfigurationGroup* slave = new VerticalConfigurationGroup(false,false,true,true);
-            slave->addChild(HostMysqlserverip_listbox());
-            slave->addChild( new Frontend_settings_group);
-
-
-        addTarget("Standalone", standalone);
-        addTarget("Frontend_only", frontend);
-        addTarget("Master_backend", backend);
-        addTarget("Slave_backend", slave);
-        connect(HostSystemType, SIGNAL(valueChanged(const QString&)),
-                this,    SLOT(SystemtypeHelp()));
-
-    };
-
-void SystemtypeGroup::SystemtypeHelp(void)
-    {
-        QString msg = (QObject::tr("Configuration for this system.  Most people will use standalone"));
-        QString selectedhostype;
-        selectedhostype = HostSystemType->getValue();
-        if  ( selectedhostype.isEmpty())
-        {
-            HostSystemType->setHelpText(msg) ;
-            return;
-        }
-
-        if (selectedhostype == "Standalone")
-            msg="Complete System, that doesn't allow outside connections";
-        if (selectedhostype == "Frontend_only")
-            msg="Frontend only, needs a  master backend already on the network";
-        if (selectedhostype ==  "Master_backend")
-            msg="Tuners, scheduling and database.  This allows for remote frontend and slave backends";
-        if (selectedhostype == "Slave_backend")
-            msg="Extra tuners";
-
-        HostSystemType->setHelpText(msg) ;
-}
-
-
-
-HostRemoteType::HostRemoteType():
-    HostImageSelect("HostRemoteType") {
-    setLabel(QObject::tr("Remote"));
-    QString dirtxt;
-    dirtxt=MV_ROOT;
-    dirtxt.append("templates/remotes");
-    QDir remotes(dirtxt);
-    remotes.setFilter(QDir::Dirs);
-    remotes.setSorting(QDir::Name | QDir::IgnoreCase);
-    const QFileInfoList *fil = remotes.entryInfoList(QDir::Dirs);
-    if (!fil)
-        return;
-
-    QFileInfoListIterator it( *fil );
-    QFileInfo *remote;
-    for( ; it.current() != 0 ; ++it )
-    {
-        remote = it.current();
-        QFileInfo preview(remote->absFilePath() + "/preview.jpg");
-            if (remote->fileName()[0] == '.' || !preview.exists() )
-            {
-            //cout << remote->absFilePath() << " Can't find preivew image, doesn't look like a remote\n";
-            continue;
-            }
-        QImage* previewImage = new QImage(preview.absFilePath());
-        addImageSelection(remote->fileName(), previewImage);
-
-    }
-
-}
-/*
-static HostComboBox *HostLCDType()
-{
-    HostComboBox *gc = new HostComboBox("HostLCDType",false);
-    gc->setLabel(QObject::tr("LCD/VFD model"));
-    gc->addSelection("no_lcd");
-    gc->addSelection("tinker");
-    gc->setValue(0);
-    gc->setHelpText(QObject::tr("VFD or LCD"));
-    QString dirtxt;
-    dirtxt=MV_ROOT;
-    dirtxt.append("templates/LCD");
-    QDir transmit(dirtxt);
-
-    //QDir transmit("/usr/share/templates/LCD");
-    transmit.setFilter(QDir::Dirs);
-    transmit.setSorting(QDir::Name | QDir::IgnoreCase);
-    const QFileInfoList *infos = transmit.entryInfoList();
-    const QFileInfo *info;
-    if (!infos)
-        return gc;
-    QFileInfoListIterator infoIt( *infos );
-    QString currentitem = ".";
-    while( (info=infoIt.current()) != 0 )
-        {
-            currentitem = info->baseName( TRUE );
-            if ( currentitem != ".." && currentitem != "." && currentitem != "")
-            {
-            gc->addSelection(currentitem);
-            }
-        ++infoIt;
-        }
-    return gc;
-};
-*/
-
-class AdvancedSettings:    public TriggeredConfigurationGroup {
-public:
-   void smb_busy_box() {
-        system ("nmbscan -d  > /tmp/smbdomainlist & ");
-        QString msgtext="Searching for windows workgroups";
-        int return_code;
-        MythBusyDialog *busy = new MythBusyDialog(msgtext);
-        // yet another incorrect way todo things, but I don't know anybetter
-        // as long as ps can find systemconfig in the list  the busy box will appear and update
-        busy->start();
-        while (  return_code == 0 )
-        {
-            return_code = myth_system("ps -ef|grep nmbscan|grep -v grep > /dev/null");
-            qApp->processEvents ();
-            usleep(900);
-        }
-        busy->Close();
-        busy->deleteLater();
-    }
-
-    AdvancedSettings():
-    TriggeredConfigurationGroup(true,true,true,true,true,true,true,true)
-    {
-
-        setLabel(QObject::tr("Advanced settings (1/3)"));
-        Setting* Autodown = HostAutodown();
-        setTrigger(Autodown);
-        hostparm.ThisSystemType 	= gContext->GetSetting("HostSystemType");
-        ConfigurationGroup *checkbox = new GridConfigurationGroup(2,false);
-                checkbox->addChild(HostServiceMythWEB());
-                checkbox->addChild(HostServiceNFS());
-                checkbox->addChild(Hostbootsplash());
-                checkbox->addChild(HostncidClient());
-
-        ConfigurationGroup* settings = new VerticalConfigurationGroup(false);
-        if  ( hostparm.ThisSystemType == "Standalone" )
-        {
-            smb_busy_box();
-            settings->addChild(new NCIDsettings);
-            settings->addChild(new SAMBAsettings);
-            #ifdef __MVAPP__
-                checkbox->addChild(GlobalServiceHobbitserver() );
-            #else
-                checkbox->addChild(HostServiceRRD() );
-            #endif
-            settings->addChild(checkbox)                ;
-        }
-        else if  (hostparm.ThisSystemType == "Master_backend" )
-        {
-            smb_busy_box();
-                checkbox->addChild(GlobalPKG_MIRROR());
-                settings->addChild(new NCIDsettings);
-                settings->addChild(new SAMBAsettings);
-            #ifdef __MVAPP__
-                checkbox->addChild(GlobalServiceHobbitserver() );
-            #else
-                checkbox->addChild(HostServiceRRD() );
-            #endif
-                settings->addChild(checkbox)                ;
-        }
-        else if  (hostparm.ThisSystemType == "Frontend_only" )
-        {
-            settings->addChild(Hostbootsplash());
-            settings->addChild(HostncidClient());
-            #ifdef __MVAPP__
-                cout << gContext->GetSetting("GlobalServiceHobbitserver") << endl;
-                cout << "above"<<endl;
-                if  ( gContext->GetSetting("GlobalServiceHobbitserver") != "0" )
-                    settings->addChild(HostServiceHobbitclient() );
-            #else
-                    settings->addChild(HostServiceRRD() );
-            #endif
-
-
-            if ( (gContext->GetSetting("GlobalPKG_MIRROR") ) == "1"  )
-                    settings->addChild(HostPKG_MIRROR());
-        }
-    else if  (hostparm.ThisSystemType == "Slave_backend" )
-        {
-            settings->addChild(Hostbootsplash());
-            settings->addChild(HostncidClient());
-            #ifdef __MVAPP__
-                if  ( gContext->GetSetting("GlobalServiceHobbitserver") != "0" )
-                    settings->addChild(HostServiceHobbitclient() );
-            #else
-                    settings->addChild(HostServiceRRD() );
-            #endif
-
-            if (  (gContext->GetSetting("GlobalPKG_MIRROR")) == "1")
-                    settings->addChild(HostPKG_MIRROR());
-        };
-        addTarget("", settings);
-    };
-};
-
-
-class AdvancedSettings_2:    public TriggeredConfigurationGroup {
-public:
-    AdvancedSettings_2():
-    TriggeredConfigurationGroup(true,true,true,true,true,true,true,true) {
-        setLabel(QObject::tr("Advanced settings (2/3)"));
-        Setting* Autodown = HostAutodown();
-        setTrigger(Autodown);
-        hostparm.ThisSystemType     = gContext->GetSetting("HostSystemType");
-
-        ConfigurationGroup *checkbox = new GridConfigurationGroup(2,false);
-                checkbox->addChild(HostServiceMythWEB());
-                checkbox->addChild(HostServiceNFS());
-                checkbox->addChild(Hostbootsplash());
-                checkbox->addChild(HostncidClient());
-
-        ConfigurationGroup* settings = new VerticalConfigurationGroup(false);
-            if  ( hostparm.ThisSystemType == "Standalone" )
-            {
-//                     settings->addChild(HostLCDType());
-//                     settings->addChild(HostTransmitproto());
-//                     settings->addChild(new LIRCsettings);
-                    settings->addChild(HostRunDHCP());
-
-                    settings->addChild(new Evroutersettings);
-            }
-            else if  (hostparm.ThisSystemType == "Master_backend" )
-            {
-//                     settings->addChild(HostLCDType());
-//                     settings->addChild(HostTransmitproto());
-//                     settings->addChild(new LIRCsettings);
-                    settings->addChild(new Backupsettings);
-                    settings->addChild(HostRunDHCP());
-                     settings->addChild(new Evroutersettings);
-            }
-            else if  (hostparm.ThisSystemType == "Frontend_only" )
-            {
-//                     settings->addChild(HostLCDType());
-//                     settings->addChild(new LIRCsettings);
-                        settings->addChild(new Evroutersettings);
-            }
-            else if  (hostparm.ThisSystemType == "Slave_backend" )
-            {
-//                     settings->addChild(HostLCDType());
-//                     settings->addChild(HostTransmitproto());
-//                     settings->addChild(new LIRCsettings);
-                       settings->addChild(new Evroutersettings);
-            };
-
-        addTarget("", settings);
-
-};
-};
-
-
-
-/*_______________________________Sound settings ____________________*/
-SoundSettings::SoundSettings():
-    TriggeredConfigurationGroup(true,true,true,true,true,true,true,true) {
-        setLabel(QObject::tr("Audio out settings"));
-
-    HostAudiotype = new HostComboBox("HostAudiotype",false);
-    HostAudiotype->setLabel(QObject::tr("Sound card driver"));
-    HostAudiotype->addSelection("OSS");
-    HostAudiotype->addSelection("ALSA");
-    HostAudiotype->addSelection("tinker");
-
-    HostAudiotype->setHelpText(QObject::tr("OSS or ALSA, your choice"));
-        addChild(HostAudiotype);
-        setTrigger(HostAudiotype);
-
-    HostsyncXine = new HostCheckBox("HostsyncXine");
-    HostsyncXine->setLabel(QObject::tr("Xine"));
-    HostsyncXine->setValue(true);
-
-    HostsyncMplayer = new HostCheckBox("HostsyncMplayer");
-    HostsyncMplayer->setLabel(QObject::tr("mplayer"));
-    HostsyncMplayer->setValue(true);
-
-    HostsyncMythMusic = new HostCheckBox("HostsyncMythMusic");
-    HostsyncMythMusic->setLabel(QObject::tr("mythmusic"));
-    HostsyncMythMusic->setValue(true);
-
-    HostsyncMythFrontend = new HostCheckBox("HostsyncMythFrontend");
-    HostsyncMythFrontend->setLabel(QObject::tr("mythfrontend"));
-    HostsyncMythFrontend->setValue(true);
-
-    HorizontalConfigurationGroup *syncboxes =   new HorizontalConfigurationGroup(false, false, true, true);
-        syncboxes->addChild(HostsyncXine);
-        syncboxes->addChild(HostsyncMplayer);
-        syncboxes->addChild(HostsyncMythMusic);
-        syncboxes->addChild(HostsyncMythFrontend);
-
-    HorizontalConfigurationGroup *lp = new HorizontalConfigurationGroup(false, false, true, true);
-    HorizontalConfigurationGroup *lpalsa = new HorizontalConfigurationGroup(false, false, true, true);
-
-    TransButtonSetting *LoadOSSbutton = new TransButtonSetting();
-    LoadOSSbutton->setLabel(tr("Load OSS driver"));
-    TransButtonSetting *LoadALSAbutton = new TransButtonSetting();
-    LoadALSAbutton->setLabel(tr("Load ALSA driver"));
-
-    TransButtonSetting *TestAudiobutton = new TransButtonSetting();
-    TestAudiobutton->setLabel(tr("Test Audio Settings"));
-        lp->addChild(TestAudiobutton);
-        lp->addChild(LoadOSSbutton);
-
-    TransButtonSetting *TestALSAAudiobutton = new TransButtonSetting();
-    TestALSAAudiobutton->setLabel(tr("Test ALSA  Audio Settings"));
-    lpalsa->addChild(TestALSAAudiobutton);
-    lpalsa->addChild(LoadALSAbutton);
-
-    TransLabelSetting *osslabel = new TransLabelSetting();
-        osslabel->setValue("The real OSS! More information can be found at:");
-
-    TransLabelSetting *osslabel1 = new TransLabelSetting();
-        osslabel1->setValue("       http://www.opensound.com ");
-
-    TransLabelSetting *AlsaLabel = new TransLabelSetting();
-        AlsaLabel->setValue("The inferior and complicated soundsystem known as ALSA ");
-
-// OSS GROUP
-    SoundOSSsettings  *OSS = new SoundOSSsettings ;
-    ConfigurationGroup* osssettings = new VerticalConfigurationGroup(false);
-        osssettings->addChild(osslabel);
-        osssettings->addChild(osslabel1);
-        osssettings->addChild(OSS);
-        osssettings->addChild(syncboxes);
-        osssettings->addChild(lp);
-    connect(this, SIGNAL(oss_sig()),
-        OSS,   SLOT(soundossgathersettings()));
-    connect(TestAudiobutton, SIGNAL(pressed()),
-        this,   SLOT(soundossgathersettings_1()));
-    connect(LoadOSSbutton, SIGNAL(pressed()),
-            OSS,   SLOT(loadossdriver()));
-
-// ALSA GROUP
-    SoundALSAsettings  *ALSA = new SoundALSAsettings ;
-    ConfigurationGroup* alsasettings = new VerticalConfigurationGroup(false);
-    alsasettings->addChild(AlsaLabel);
-    alsasettings->addChild(ALSA);
-    alsasettings->addChild(syncboxes);
-    alsasettings->addChild(lpalsa);
-
-    connect(this, SIGNAL(alsa_sig()),
-            ALSA,   SLOT(soundalsagathersettings()));
-    connect(TestALSAAudiobutton, SIGNAL(pressed()),
-            this,   SLOT(soundalsagathersettings_1()));
-    connect(LoadALSAbutton, SIGNAL(pressed()),
-            ALSA,   SLOT(loadalsadriver()));
-    addTarget("ALSA", alsasettings);
-    addTarget("OSS", osssettings);
-    addTarget("tinker", new VerticalConfigurationGroup(false));
-};
-
-
-SoundOSSsettings::SoundOSSsettings():
-    TriggeredConfigurationGroup(true,false,true,true,true,true,true,true)
-{
-    SetVertical(true);
-    HostSoundTypeout = new HostComboBox("HostSoundTypeout");
-    HostSoundTypeout->setLabel(QObject::tr("Type"));
-    HostSoundTypeout->addSelection("Analog");
-    HostSoundTypeout->addSelection("Digital");
-    HostSoundTypeout->setHelpText(QObject::tr(""));
-
-    HostSoundOssAnalog = new HostComboBox("HostSoundOssAnalog");
-    HostSoundOssDigital = new HostComboBox("HostSoundOssDigital");
-    fillossselection();
-    int findossanalog=HostSoundOssAnalog->findSelection(hostparm.OLDHostSoundOSSAnalog );
-    int findossdigital=HostSoundOssDigital->findSelection(hostparm.OLDHostSoundOSSDigital );
-    HostSoundOssAnalog->setValue(findossanalog);
-    HostSoundOssDigital->setValue(findossdigital);
-    addChild(HostSoundTypeout);
-    setTrigger(HostSoundTypeout);
-    addTarget("Analog", HostSoundOssAnalog);
-    addTarget("Digital", HostSoundOssDigital);
-};
-
-SoundALSAsettings::SoundALSAsettings():
-        TriggeredConfigurationGroup(true,false,true,true,true,true,true,true)
-        {
-            SetVertical(true);
-            HostSoundALSATypeout = new HostComboBox("HostSoundALSATypeout");
-            HostSoundALSATypeout->setLabel(QObject::tr("Type"));
-            HostSoundALSATypeout->addSelection("Analog");
-            HostSoundALSATypeout->addSelection("Digital");
-            HostSoundALSATypeout->setHelpText(QObject::tr(""));
-
-            HostSoundALSAAnalog = new HostComboBox("HostSoundALSAAnalog");
-            HostSoundALSADigital = new HostComboBox("HostSoundALSADigital");
-            fillALSAselection();
-            int findalsaanalog=HostSoundALSAAnalog->findSelection(hostparm.OLDHostSoundALSAAnalog );
-            int findalsadigital=HostSoundALSADigital->findSelection(hostparm.OLDHostSoundALSADigital );
-            HostSoundALSAAnalog->setValue(findalsaanalog);
-            HostSoundALSADigital->setValue(findalsadigital);
-            addChild(HostSoundALSATypeout);
-            setTrigger(HostSoundALSATypeout);
-            addTarget("Analog", HostSoundALSAAnalog);
-            addTarget("Digital", HostSoundALSADigital);
-        };
-
-void  SoundOSSsettings::loadossdriver()
-{
-    cout << "oss button pressed" << endl;
-
-// Add info popup right here
-    QString cmdtxt;
-    cmdtxt="sudo ";
-    cmdtxt.append(MV_ROOT) ;
-//    cmdtxt=MV_ROOT  ;
-    cmdtxt.append("bin/soundconfig.sh -t LOAD  -i OSS &");
-    system(cmdtxt);
-    int return_code = 0;
-    QString msgtext = "Loading OSS driver" ;
-
-    MythBusyDialog *busy = new MythBusyDialog(msgtext);
-    // yet another incorrect way todo things, but I don't know anybetter
-    // as long as ps can find systemconfig in the list  the busy box will appear and update
-    busy->start();
-    while (  return_code == 0 )
-    {
-        return_code = myth_system("ps -ef|grep soundconfig.sh|grep -v grep > /dev/null");
-        qApp->processEvents ();
-        usleep(900);
-    }
-    busy->Close();
-    busy->deleteLater();
-    fillossselection();
-
-}
-void  SoundALSAsettings::loadalsadriver()
-{
-    cout << "Loading alsa driver" << endl;
-    QString cmdtxt;
-    cmdtxt="sudo ";
-    cmdtxt.append(MV_ROOT) ;
-    cmdtxt.append("bin/soundconfig.sh -t LOAD  -i ALSA &");
-    system(cmdtxt);
-    int return_code = 0;
-    QString msgtext = "Loading ALSA driver" ;
-
-    MythBusyDialog *busy = new MythBusyDialog(msgtext);
-    // yet another incorrect way todo things, but I don't know anybetter
-    // as long as ps can find systemconfig in the list  the busy box will appear and update
-    busy->start();
-    while (  return_code == 0 )
-    {
-        return_code = myth_system("ps -ef|grep soundconfig.sh|grep -v grep > /dev/null");
-        qApp->processEvents ();
-        usleep(900);
-    }
-    busy->Close();
-    busy->deleteLater();
-    HostSoundALSAAnalog-> clearSelections();
-    HostSoundALSADigital-> clearSelections();
-
-    fillALSAselection();
-
-}
-void  SoundOSSsettings::fillossselection()
-{
-    myth_system("ossinfo -v1 -a |grep device > /tmp/ossdevices");
-    QString currentitem;
-    QString currentfile = "/tmp/ossdevices";
-    QString line;
-    QString legacy_device;
-    QString simpleitem;
-    QString currentitemtext;
-    QRegExp sep( "\t"   );
-    QFile file(currentfile);
-    QString ossfound="false";
-    HostSoundOssAnalog->clearSelections();
-    HostSoundOssDigital-> clearSelections();
-
-
-    if ( file.open(IO_ReadOnly | IO_Translate) )
-    {
-        QTextStream t( &file );        // use a text stream
-        while ( !t.eof() )
-        {
-            line = t.readLine();
-            if (line.contains("device index") )
-            {
-                legacy_device = t.readLine();
-                legacy_device= legacy_device.section( "/",2,2);
-                currentitemtext=line.section( "/" , 0 ,0 );
-                simpleitem = currentitemtext.simplifyWhiteSpace();
-                simpleitem = simpleitem.remove ( "(" );
-                simpleitem = simpleitem.remove ( ")" );
-                simpleitem.append(" (");
-                simpleitem.append(legacy_device);
-                simpleitem.append(")");
-                if (line.contains("spdout") || line.contains("digital") )
-                    HostSoundOssDigital->addSelection(simpleitem);
-                else
-                    HostSoundOssAnalog->addSelection(simpleitem);
-                ossfound="true";
-            }
-        }
-        if (ossfound=="false")
-        {
-            simpleitem="No cards found, try loading the OSS drivers";
-            HostSoundOssAnalog->addSelection(simpleitem);
-            HostSoundOssDigital->addSelection(simpleitem);
-        }
-    }
-return ;
-};
-
-
-void  SoundALSAsettings::fillALSAselection()
-{
-    HostSoundALSAAnalog-> clearSelections();
-    HostSoundALSADigital-> clearSelections();
-    myth_system("aplay -l > /tmp/alsadevices");
-    QString currentfile = "/tmp/alsadevices";
-    QString line;
-    QString hwdevice;
-    QString alsadescription;
-    QString temphwdevice;
-    QString simpleitem;
-    QFile file(currentfile);
-    if ( file.open(IO_ReadOnly | IO_Translate) )
-    {
-        QTextStream t( &file );        // use a text stream
-        while ( !t.eof() )
-        {
-            line = t.readLine();
-            if (line.startsWith("card") )
-            {
-                if (line.contains("snd_ctl_card_info"))
-                {
-                    simpleitem="Try loading the alsa drivers";
-                    HostSoundALSAAnalog->addSelection(simpleitem);
-                    HostSoundALSADigital->addSelection(simpleitem);
-                    break;
-                }
-                //card 0: I82801DBICH4 [Intel 82801DB-ICH4], device 0: Intel ICH [Intel 82801DB-ICH4]
-                alsadescription=line.section( "," , 0 ,0 );
-                alsadescription=alsadescription.section(":",1,1);
-                hwdevice=line.section( ":" , 0 ,0 );
-                hwdevice=hwdevice.section( " " , -1,-1 );
-                //grabbing 2nd half of device
-                temphwdevice=line.section(",",1,1);
-                temphwdevice=temphwdevice.section(":",0,0);
-                temphwdevice=temphwdevice.section(" ",-1,-1 );
-                hwdevice.append(",");
-                hwdevice.append(temphwdevice);
-                simpleitem=alsadescription + "(hw:" + hwdevice + ")";
-                if (line.contains("IEC958") )
-                    HostSoundALSADigital->addSelection(simpleitem);
-                else
-                    HostSoundALSAAnalog->addSelection(simpleitem);
-            }
-        }
-    }
-return ;
-
-}
-
-void SoundSettings::soundossgathersettings_1 (void)
-{
-    hostparm.ThisHostAudiotype = HostAudiotype->getValue();
-    hostparm.ThisHostsyncXine = HostsyncXine->getValue();
-    hostparm.ThisHostsyncMplayer = HostsyncMplayer->getValue();
-    hostparm.ThisHostsyncMythMusic = HostsyncMythMusic->getValue();
-    hostparm.ThisHostsyncMythFrontend = HostsyncMythFrontend->getValue();
-    // emit the signal to call soundossgathersetting.
-    emit oss_sig();
-};
-void SoundSettings::soundalsagathersettings_1 (void)
-{
-    hostparm.ThisHostAudiotype = HostAudiotype->getValue();
-    hostparm.ThisHostsyncXine = HostsyncXine->getValue();
-    hostparm.ThisHostsyncMplayer = HostsyncMplayer->getValue();
-    hostparm.ThisHostsyncMythMusic = HostsyncMythMusic->getValue();
-    hostparm.ThisHostsyncMythFrontend = HostsyncMythFrontend->getValue();
-    // emit the signal to call soundALSAgathersetting.
-    emit alsa_sig();
-};
-
-
-void SoundOSSsettings::soundossgathersettings(void)
-{
-    hostparm.ThisHostSoundTypeout =  HostSoundTypeout->getValue() ;
-    hostparm.ThisHostSoundOSSAnalog = HostSoundOssAnalog->getValue();
-    hostparm.ThisHostSoundOSSDigital = HostSoundOssDigital->getValue();
-    QString tempdevice;
-    if  ( hostparm.ThisHostSoundTypeout == "Analog" )
-    {
-        tempdevice  =  hostparm.ThisHostSoundOSSAnalog ;
-    }
-    else
-    {
-        tempdevice = hostparm.ThisHostSoundOSSDigital ;
-    };
-    tempdevice = tempdevice.section( "(", 1,1 );
-    tempdevice = tempdevice.section( ")", 0,0 );
-    hostparm.ThisHostSoundDevice = "/dev/";
-    hostparm.ThisHostSoundDevice.append(tempdevice);
-    // Add info popup right here
-    QString cmdtxt;
-    cmdtxt=MV_ROOT  ;
-    cmdtxt.append("bin/soundconfig.sh -t test  -i OSS -d " +  hostparm.ThisHostSoundDevice + "&");
-    system(cmdtxt);
-    int return_code = 0;
-    QString msgtext = "Playing sample audio" ;
-    MythBusyDialog *busy = new MythBusyDialog(msgtext);
-    // yet another incorrect way todo things, but I don't know anybetter
-    // as long as ps can find systemconfig in the list  the busy box will appear and update
-    busy->start();
-    while (  return_code == 0 )
-    {
-        return_code = myth_system("ps -ef|grep soundconfig.sh|grep -v grep > /dev/null");
-        qApp->processEvents ();
-        usleep(900);
-    }
-    busy->Close();
-    busy->deleteLater();
-};
-
-void SoundALSAsettings::soundalsagathersettings(void)
-{
-
-    hostparm.ThisHostSoundALSATypeout =  HostSoundALSATypeout->getValue() ;
-    hostparm.ThisHostSoundALSAAnalog = HostSoundALSAAnalog->getValue();
-    hostparm.ThisHostSoundALSADigital = HostSoundALSADigital->getValue();
-//     cout << hostparm.ThisHostSoundALSATypeout << endl;
-//     cout << hostparm.ThisHostSoundALSAAnalog << endl;
-//     cout << hostparm.ThisHostSoundALSADigital << endl;
-
-    //  Intel [HDA Intel](hw:0,0)
-
-//     cout << "--------" << endl;
-    QString tempdevice;
-    if  ( hostparm.ThisHostSoundALSATypeout == "Analog" )
-    {
-        tempdevice  =  hostparm.ThisHostSoundALSAAnalog ;
-    }
-    else
-    {
-        tempdevice = hostparm.ThisHostSoundALSADigital ;
-    };
-    tempdevice = tempdevice.section( "(", 1,1 );
-    tempdevice = tempdevice.section( ")", 0,0 );
-    hostparm.ThisHostSoundDevice = tempdevice;
-    // Add info popup right here
-    QString cmdtxt;
-    cmdtxt=MV_ROOT  ;
-    cmdtxt.append("bin/soundconfig.sh -t test  -i ALSA -d " +  hostparm.ThisHostSoundDevice + "&");
-    system(cmdtxt);
-    int return_code = 0;
-    QString msgtext = "Playing sample audio" ;
-
-    MythBusyDialog *busy = new MythBusyDialog(msgtext);
-    busy->start();
-    while (  return_code == 0 )
-    {
-        return_code = myth_system("ps -ef|grep soundconfig.sh|grep -v grep > /dev/null");
-        qApp->processEvents ();
-        usleep(900);
-    }
-    busy->Close();
-    busy->deleteLater();
-};
-
-
-/* __________________________ END OF CLASSES_________________________*/
-
-void pre_writesettings ()
-{
-    hostparm.ThisSystemType = gContext->GetSetting("HostSystemType");
-    hostparm.ThisDBhost = gContext->GetSetting("HostMysqlServer");
-    hostparm.ThisHostName   	= gContext->GetSetting("HostMyhostname");
-
-    if  ( hostparm.ThisSystemType == "Standalone" )
-    {
-            hostparm.ThisDBhost = "localhost" ;
-            hostparm.ThisRunfrontend = "1" ;
-            gContext->SaveSetting("HostRunFrontend", hostparm.ThisRunfrontend );
-        // disable pkgmirror
-            hostparm.ThisHostPKG_MIRROR = "0";
-            gContext->SaveSetting("GlobalPKG_MIRROR", hostparm.ThisHostPKG_MIRROR );
-            hostparm.ThisHostServiceHobbit = gContext->GetSetting("GlobalServiceHobbitserver");
-            if (hostparm.ThisHostServiceHobbit == "" )
-            {
-                hostparm.ThisHostServiceHobbit = "1";
-                 QString s = "GlobalServiceHobbitserver";
-                 gContext->SaveSettingOnHost(s, hostparm.ThisHostServiceHobbit ,NULL);
-            }
-    }
-    else if  (hostparm.ThisSystemType == "Master_backend" )
-    {
-            if ( hostparm.ThisNFS =="" &&  gContext->GetSetting("HostServiceNFS")  == "" )
-            {
-                hostparm.ThisNFS = "1";
-                gContext->SaveSetting("HostServiceNFS",hostparm.ThisNFS );
-            }
-            hostparm.ThisDBhost = "127.0.0.1" ;
-            //GlobalPKG is only an option for MBE
-            hostparm.ThisHostPKG_MIRROR = (gContext->GetSetting("GlobalPKG_MIRROR")) ;
-            hostparm.ThisHostServiceHobbit = gContext->GetSetting("GlobalServiceHobbitserver");
-            if (hostparm.ThisHostServiceHobbit == "" )
-            {
-                hostparm.ThisHostServiceHobbit = "1";
-                 QString s = "GlobalServiceHobbitserver";
-                 gContext->SaveSettingOnHost(s, hostparm.ThisHostServiceHobbit,NULL );
-            }
-    }
-    else if  (hostparm.ThisSystemType == "Frontend_only" )
-    {
-            hostparm.ThisRunfrontend     = "1" ;
-            hostparm.ThisSamba    = "0";
-            hostparm.ThisNFS       = "0";
-            hostparm.ThisMythWEB         = "0";
-            gContext->SaveSetting("HostRunFrontend",  hostparm.ThisRunfrontend );
-            gContext->SaveSetting("HostServiceSamba", hostparm.ThisSamba );
-            gContext->SaveSetting("HostServiceNFS",  hostparm.ThisNFS );
-            gContext->SaveSetting("HostServiceMythWEB",hostparm.ThisMythWEB );
-            // if GBL is enabled, then check for host setting, else disable it
-            if ( (gContext->GetSetting("GlobalPKG_MIRROR") ) == "1"  )
-            {
-                hostparm.ThisHostPKG_MIRROR     = gContext->GetSetting("HostPKG_MIRROR");
-            }
-            else
-            {
-                hostparm.ThisHostPKG_MIRROR = "0";
-            };
-//             cout << "install_hobbit:" <<endl;
-//             cout << install_hobbit << endl;
-//             cout <<"-----------------"<< endl;
-            if ( ((gContext->GetSetting("GlobalServiceHobbitserver") ) == "1") || install_hobbit )
-            {
-                hostparm.ThisHostServiceHobbit = gContext->GetSetting("HostServiceHobbitclient");
-//                 cout <<"might install hobbit!" << endl;
-                cout <<  hostparm.ThisHostServiceHobbit << endl;
-
-            }
-            else
-            {
-                    hostparm.ThisHostServiceHobbit = "0";
-                    cout <<" don't install hobbit" << endl;
-            }
-
-        gContext->SaveSetting("HostPKG_MIRROR",   hostparm.ThisHostPKG_MIRROR );
-        gContext->SaveSetting("HostServiceHobbitclient",   hostparm.ThisHostServiceHobbit);
-
-    }
-    else if  (hostparm.ThisSystemType == "Slave_backend" )
-    {
-            hostparm.ThisSamba      	 = "0";
-            hostparm.ThisNFS        	 = "0";
-            hostparm.ThisMythWEB         = "0";
-            gContext->SaveSetting("HostServiceSamba", hostparm.ThisSamba );
-            gContext->SaveSetting("HostServiceNFS",  hostparm.ThisNFS );
-            gContext->SaveSetting("HostServiceMythWEB",hostparm.ThisMythWEB );
-            if ( (gContext->GetSetting("GlobalPKG_MIRROR") ) == "1"  )
-            {
-                hostparm.ThisHostPKG_MIRROR     = gContext->GetSetting("HostPKG_MIRROR");
-            }
-            else
-            {
-                hostparm.ThisHostPKG_MIRROR = "0";
-            }
-            if ( ((gContext->GetSetting("GlobalServiceHobbitserver") ) == "1") || install_hobbit )
-            {
-                hostparm.ThisHostServiceHobbit = gContext->GetSetting("HostServiceHobbitclient");
-            }
-            else
-            {
-
-                hostparm.ThisHostServiceHobbit = "0";
-            }
-
-            gContext->SaveSetting("HostPKG_MIRROR",   hostparm.ThisHostPKG_MIRROR );
-            gContext->SaveSetting("HostServiceHobbitclient",   hostparm.ThisHostServiceHobbit);
-
-    };
-
-    if ( hostparm.ThisHostDefaultInterface == "" )
-    {
-    if ( gContext->GetSetting("HostDefaulteth0") == "1" )
-            hostparm.ThisHostDefaultInterface = "eth0";
-    else if ( gContext->GetSetting("HostDefaulteth1") == "1" )
-            hostparm.ThisHostDefaultInterface = "eth1";
-    else if ( gContext->GetSetting("HostDefaultwlan0") == "1" )
-            hostparm.ThisHostDefaultInterface = "wlan0";
-    else if ( gContext->GetSetting("HostDefaultwlan1") == "1" )
-            hostparm.ThisHostDefaultInterface = "wlan1";
-    else if ( gContext->GetSetting("HostActiveonbooteth0") == "1" )
-            hostparm.ThisHostDefaultInterface = "eth0";
-    else if ( gContext->GetSetting("HostActiveonbooteth1") == "1" )
-            hostparm.ThisHostDefaultInterface = "eth1";
-    else if ( gContext->GetSetting("HostActiveonbootwlan0") == "1" )
-            hostparm.ThisHostDefaultInterface = "wlan0";
-    else if ( gContext->GetSetting("HostActiveonbootwlan1") == "1" )
-            hostparm.ThisHostDefaultInterface = "wlan1";
-    else
-            hostparm.ThisHostDefaultInterface = "ack";
-    }
-// Even after all the above, it's still possible to set the Default interface to one that isn't active.
-
-    hostparm.ThisDBhost =  hostparm.ThisDBhost.section( "\t", 0, 0 );
-    //remove spaces from hostname
-    std::string s = hostparm.ThisHostName;
-    std::string::iterator it = std::remove_if(s.begin(), s.end(), std::bind2nd(std::equal_to<char>(), ' '));
-    s = std::string(s.begin(), it);
-    hostparm.ThisHostName = s;
-    if  ( hostparm.ThisHostName == "" )
-    {
-        hostparm.ThisHostName=gContext->GetHostName();
-        std::string s = hostparm.ThisHostName;
-        std::string::iterator it = std::remove_if(s.begin(), s.end(), std::bind2nd(std::equal_to<char>(), ' '));
-        s = std::string(s.begin(), it);
-        hostparm.ThisHostName = s;
-        if ( hostparm.ThisHostName == "" )
-                hostparm.ThisHostName = "You_Fool";
-    }
-    // piece togther the timezone
-    QString tz;
-    QString tregion;
-    QString tsubregion;
-
-    tz=gContext->GetSetting("HostTimeZone");
-
-    cout << "tz extracted from database: " << tz << endl;
-    if ( tz.isEmpty() || (tz == "Unknown"))
-      timezone_unknown = TRUE;
-
-    tregion=gContext->GetSetting("HostTimeZoneRegion");
-    tsubregion=gContext->GetSetting("HostTimeZoneRegion_"+tregion);
-    if ( tsubregion.isEmpty() )
-        hostparm.ThisTimeZone  = tregion;
-    else
-        hostparm.ThisTimeZone  = tregion + "/" + tsubregion;
-
-    cout << "hostparm.ThisTimeZone " << hostparm.ThisTimeZone  << endl;
-    // save some settings  back to the datebase
-    gContext->SaveSetting("HostMyhostname" , hostparm.ThisHostName );
-    gContext->SaveSetting("HostMysqlserver", hostparm.ThisDBhost );
-    gContext->SaveSetting("HostTimeZone", hostparm.ThisTimeZone );
-}
-
-void run_systemconfig(QString modulelist, bool restart, QString dbcommand)
-{
-    QString cmdtxt;
-    cmdtxt="sudo ";
-    cmdtxt.append(MV_ROOT) ;
-    cmdtxt.append("bin/systemconfig.sh " + modulelist + " &");
-    myth_system(cmdtxt);
-    int return_code = 0;
-    QString msgtext = "Please wait while  " ;
-    msgtext.append(gContext->GetSetting("HostMyhostname"));
-    msgtext.append(" is configured");
-    MythBusyDialog *busy = new MythBusyDialog(msgtext);
-    busy->start();
-    while (  return_code == 0 )
-    {
-        return_code = myth_system("ps -ef|grep systemconfig.sh|grep -v grep > /dev/null");
-        qApp->processEvents ();
-        usleep(900);
-    }
-    busy->Close();
-    busy->deleteLater();
-    if  (restart)
-    {
-        return_code = 1;
-        int loopnumber=0 ;
-        bool doloop = true;
-        MythBusyDialog *busy = new MythBusyDialog(
-            QObject::tr("Transferring database settings"));
-        // yet another incorrect way todo things, but I don't know anybetter
-        // as long as ps can find systemconfig in the list  the busy box will appear and update
-        busy->start();
-        while (  doloop )
-        {
-            return_code = myth_system(dbcommand);
-            qApp->processEvents ();
-            usleep(100);
-            loopnumber++ ;
-            if  ( return_code == 0 || loopnumber >= 20000000 )
-                doloop=false;
-            cout << loopnumber << endl;
-        }
-        busy->Close();
-        busy->deleteLater();
-    };
-
-
-
-}
-
-
-
-int runsettings (bool mysqlonly , bool shownetwork , bool showhostype, bool showmisc , bool showshutdown, bool showadvanced,bool showsound,bool showadvancedX, bool showaccesscontrol, bool showplugins , bool showuser , bool showwebuser , bool showddns , bool showinfrared , bool showscreensaver )
-{
-        displaymysqlonly = false ;
-        displayshownetwork =false ;
-        displayshowhostype = false ;
-        displayshowmisc =false ;
-        displayshowshutdown =false ;
-        displayshowadvanced = false;
-        displayshowsound = false ;
-        displayshowadvancedX = false;
-        displayaccesscontrol= false;
-        displayplugins= false;
-        displayuser = false;
-        displaywebuser = false;
-        displayddns = false;
-        displayinfrared = false;
-        displayscreensaver = false;
-
-        gContext->ActivateSettingsCache(true);
-        gContext->ClearSettingsCache();
-        bool  runothers=false;
-        bool continuerun=true;
-        int retc = 0 ;
-        displaymysqlonly = mysqlonly;
-
-        if (displaymysqlonly )
-        {
-            MythInstallSettings mysqlsettings;
-            mysqlsettings.load();
-            mysqlsettings.save();
-            if ( mysqlsettings.exec() == QDialog::Accepted )
-            {
-                retc = 1;
-            }
-            else
-            {
-                retc=2;
-            };
-        };
-
-        if ( shownetwork )
-        {
-            displayshownetwork = shownetwork;
-            MythInstallSettings settings;
-            settings.load();
-            settings.save();
-            if ( settings.exec() == QDialog::Accepted )
-                {
-                retc = 1;
-                }
-                else
-                {
-                    continuerun=false;
-                    retc=2;
-                };
-            displayshownetwork = false;
-        };
-
-        if (   showhostype && continuerun )
-        {
-            displayshowhostype = showhostype;
-            system ("avahi-browse -l -r  -t  _mysql._tcp > /tmp/mysqllist");
-            MythInstallSettings settings1;
-            settings1.load();
-            settings1.save();
-            if ( settings1.exec() == QDialog::Accepted )
-            {
-                retc = 1;
-            }
-            else
-            {
-                continuerun=false;
-                retc=2;
-            };
-            displayshowhostype=false;
-        }
-
-        if ( showmisc  ||  showshutdown || showsound   || showadvancedX || showadvanced || showaccesscontrol || showplugins || showuser || showwebuser || showddns || showinfrared || showscreensaver )
-        {
-            runothers=true;
-            displayshowmisc = showmisc;
-            displayshowshutdown = showshutdown;
-            displayshowadvanced = showadvanced;
-            displayshowsound = showsound;
-            displayshowadvancedX = showadvancedX;
-            hostparm.displayshowadvancedX=showadvancedX;
-            displayaccesscontrol = showaccesscontrol ;
-            displayplugins = showplugins;
-            displayuser = showuser;
-            displaywebuser = showwebuser;
-            displayddns = showddns ;
-            displayinfrared = showinfrared;
-            displayscreensaver = showscreensaver;
-
-            if (displayshowadvancedX)
-            {
-                ReadDDCvalues();
-            }
-        };
-
-
-    if ( runothers && continuerun )
-        {
-        //do I need this prewerite?
-        pre_writesettings();
-        DatabaseParams params = gContext->GetDatabaseParams();
-        QString cmdtxt=MV_ROOT  ;
-        cmdtxt.append("bin/timezip.py -m ");
-        QString zipcommand=cmdtxt;
-        zipcommand.append(hostparm.ThisDBhost);
-        zipcommand.append("  -d " + params.dbHostName );
-        cout << zipcommand << endl;
-        myth_system(zipcommand);
-        hostparm.ThisHostZipcode        = gContext->GetSetting("HostZipcode");
-        hostparm.ThisTimeZone           = gContext->GetSetting("HostTimeZone");
-        hostparm.ThisHostServiceHobbit  = gContext->GetSetting("HostServiceHobbitclient");
-        if  ( hostparm.ThisHostServiceHobbit == "1" )
-            install_hobbit = true;
-/*
-        cout << "install_hobbit:" <<endl;
-        cout << install_hobbit << endl;
-        cout <<"-----------------"<< endl; */
-
-        MythInstallSettings settings2;
-        settings2.load();
-        settings2.save();
-        gContext->SaveSetting("HostServiceHobbitclient", hostparm.ThisHostServiceHobbit );
-        if ( settings2.exec() == QDialog::Accepted )
-            {
-                retc = 1;
-                cout <<"i should save my settings(2)" << endl;
-            }
-            else
-            {
-                continuerun=false;
-                retc=2;
-                cout <<"no save for settings2 " << endl;
-            };
-        };
-        pre_writesettings();
-        if ( mysqlonly )
-        {
-            QString cmdtxt;
-            cmdtxt=MV_ROOT  ;
-            cmdtxt.append("bin/systemconfig.sh Mysql_only " +  hostparm.ThisDBhost);
-            myth_system(cmdtxt);
-        }
-        else
-        {
-            if (retc == 1)
-                writesettings();
-        }
-        return retc;
-};
-
-
-
-void writesettings ()
-{
-        ofstream myfile;
-        hostparm.ThisHostName   	= gContext->GetSetting("HostMyhostname");
-        hostparm.ThisHostDHCPhostname   = gContext->GetSetting("HostDHCPhostname");
-        //hostparm.ThisTimeZone       = gContext->GetSetting("HostTimeZone");
-        hostparm.ThisHostIP  		= gContext->GetSetting("HostIP");
-        hostparm.ThisNETMASK       	= gContext->GetSetting("HostNETMASK");
-        hostparm.ThisGW		        = gContext->GetSetting("HostGW");
-        hostparm.ThisDNS	        = gContext->GetSetting("HostDNS");
-        hostparm.ThisDHCP              = gContext->GetSetting("HostUseDHCP");
-
-        //hostparm.ThisHostDefaultInterface=gContext->GetSetting("HostDefaultInterface");
-
-        hostparm.ThisHostIPeth0         =  gContext->GetSetting("HostIPeth0");
-        hostparm.ThisHostNETMASKeth0    =  gContext->GetSetting("HostNETMASKeth0");
-        hostparm.ThisHostDNSeth0        =  gContext->GetSetting("HostDNSeth0");
-        hostparm.ThisHostUSEDHCPeth0    =  gContext->GetSetting("HostUseDHCPeth0");
-        hostparm.ThisHostGWeth0         =  gContext->GetSetting("HostGWeth0");
-        hostparm.ThisHostActiveonbooteth0  =  gContext->GetSetting("HostActiveonbooteth0");
-        hostparm.ThisHOSTESSIDeth0      =  gContext->GetSetting("HOSTESSIDeth0");
-        hostparm.ThisHostUseEncryptioneth0 = gContext->GetSetting("HostUseEncryptioneth0");
-        hostparm.ThisHostkeyeth0           = gContext->GetSetting("Hostkeyeth0");
-        hostparm.ThisHostMTUeth0        = gContext->GetSetting("HostMTUeth0");
-
-        hostparm.ThisHostIPeth1         =  gContext->GetSetting("HostIPeth1");
-        hostparm.ThisHostNETMASKeth1    =  gContext->GetSetting("HostNETMASKeth1");
-        hostparm.ThisHostDNSeth1        =  gContext->GetSetting("HostDNSeth1");
-        hostparm.ThisHostUSEDHCPeth1    =  gContext->GetSetting("HostUseDHCPeth1");
-        hostparm.ThisHostGWeth1         =  gContext->GetSetting("HostGWeth1");
-        hostparm.ThisHostActiveonbooteth1  =  gContext->GetSetting("HostActiveonbooteth1");
-        hostparm.ThisHOSTESSIDeth1      =  gContext->GetSetting("HOSTESSIDeth1");
-        hostparm.ThisHostUseEncryptioneth1 = gContext->GetSetting("HostUseEncryptioneth1");
-        hostparm.ThisHostkeyeth1           = gContext->GetSetting("Hostkeyeth1");
-        hostparm.ThisHostMTUeth1        = gContext->GetSetting("HostMTUeth1");
-
-        hostparm.ThisHostIPwlan0         =  gContext->GetSetting("HostIPwlan0");
-        hostparm.ThisHostNETMASKwlan0    =  gContext->GetSetting("HostNETMASKwlan0");
-        hostparm.ThisHostDNSwlan0        =  gContext->GetSetting("HostDNSwlan0");
-        hostparm.ThisHostUSEDHCPwlan0    =  gContext->GetSetting("HostUseDHCPwlan0");
-        hostparm.ThisHostGWwlan0         =  gContext->GetSetting("HostGWwlan0");
-        hostparm.ThisHostActiveonbootwlan0  =  gContext->GetSetting("HostActiveonbootwlan0");
-        hostparm.ThisHOSTESSIDwlan0      =  gContext->GetSetting("HOSTESSIDwlan0");
-        hostparm.ThisHostUseEncryptionwlan0 = gContext->GetSetting("HostUseEncryptionwlan0");
-        hostparm.ThisHostkeywlan0           = gContext->GetSetting("Hostkeywlan0");
-        hostparm.ThisHostMTUwlan0        = gContext->GetSetting("HostMTUwlan0");
-
-        hostparm.ThisHostIPwlan1         =  gContext->GetSetting("HostIPwlan1");
-        hostparm.ThisHostNETMASKwlan1    =  gContext->GetSetting("HostNETMASKwlan1");
-        hostparm.ThisHostDNSwlan1        =  gContext->GetSetting("HostDNSwlan1");
-        hostparm.ThisHostUSEDHCPwlan1    =  gContext->GetSetting("HostUseDHCPwlan1");
-        hostparm.ThisHostGWwlan1         =  gContext->GetSetting("HostGWwlan1");
-        hostparm.ThisHostActiveonbootwlan1  =  gContext->GetSetting("HostActiveonbootwlan1");
-        hostparm.ThisHOSTESSIDwlan1      =  gContext->GetSetting("HOSTESSIDwlan1");
-        hostparm.ThisHostUseEncryptionwlan1 = gContext->GetSetting("HostUseEncryptionwlan1");
-        hostparm.ThisHostkeywlan1           = gContext->GetSetting("Hostkeywlan1");
-        hostparm.ThisHostMTUwlan1        = gContext->GetSetting("HostMTUwlan1");
-
-        hostparm.ThisHostIPath0         =  gContext->GetSetting("HostIPath0");
-        hostparm.ThisHostNETMASKath0    =  gContext->GetSetting("HostNETMASKath0");
-        hostparm.ThisHostDNSath0        =  gContext->GetSetting("HostDNSath0");
-        hostparm.ThisHostUSEDHCPath0    =  gContext->GetSetting("HostUseDHCPath0");
-        hostparm.ThisHostGWath0         =  gContext->GetSetting("HostGWath0");
-        hostparm.ThisHostActiveonbootath0  =  gContext->GetSetting("HostActiveonbootath0");
-        hostparm.ThisHOSTESSIDath0      =  gContext->GetSetting("HOSTESSIDath0");
-        hostparm.ThisHostUseEncryptionath0 = gContext->GetSetting("HostUseEncryptionath0");
-        hostparm.ThisHostkeyath0           = gContext->GetSetting("Hostkeyath0");
-        hostparm.ThisHostMTUath0        = gContext->GetSetting("HostMTUath0");
-
-
-        hostparm.ThisHostServiceRRD = gContext->GetSetting("HostServiceRRD");
-        hostparm.ThisSamba          = gContext->GetSetting("HostServiceSamba");
-        hostparm.ThisHostServiceSamba_media = gContext->GetSetting("HostServiceSamba_media");
-        hostparm.ThisHostServiceSamba_write = gContext->GetSetting("HostServiceSamba_write");
-        hostparm.ThisHostServiceSamba_home = gContext->GetSetting("HostServiceSamba_home");
-        hostparm.ThisHostServiceSamba_writehome = gContext->GetSetting("HostServiceSamba_writehome");
-        hostparm.ThisHostServiceSamba_domain = gContext->GetSetting("HostServiceSamba_domain");
-        hostparm.ThisNFS               	= gContext->GetSetting("HostServiceNFS");
-        hostparm.ThisMythWEB    	       = gContext->GetSetting("HostServiceMythWEB");
-        hostparm.ThisHostwebauth           = gContext->GetSetting("HOSTwebauth");
-
-        hostparm.ThisHostRunDHCP =  gContext->GetSetting("HostRunDHCP");
-        hostparm.ThisSystemType 	= gContext->GetSetting("HostSystemType");
-        hostparm.ThisRemote     	       = gContext->GetSetting("HostRemoteType");
-        hostparm.ThisHostLircWait      = gContext->GetSetting("HostLircWait");
-      //  hostparm.ThisBlaster    	       = gContext->GetSetting("HostTransmitproto");
-        hostparm.ThisReceiverType  	= gContext->GetSetting("HostReceiverType");
-        hostparm.ThisHostSerialPortlirc = gContext->GetSetting("HostSerialPortlirc");
-        hostparm.ThisHostUseEvrouter = gContext->GetSetting("HostRunEvrouter");
-        hostparm.ThisHostEvrouterConfig = gContext->GetSetting("HostEvrouterConfig");
-        hostparm.ThisXres     		= gContext->GetSetting("HostXres");
-        hostparm.ThisAutodown		= gContext->GetSetting("HostAutodown");
-        hostparm.ThisShutdowntime	= gContext->GetSetting("HostShutdownTime");
-        hostparm.ThisShutdowntime2  = gContext->GetSetting("HostShutdownTime2");
-        hostparm.ThisWakeuptime	= gContext->GetSetting("HostWakeupTime");
-        hostparm.ThisUseNVRAM		= gContext->GetSetting("HostUseNVRAM");
-        hostparm.ThisUseWOL		= gContext->GetSetting("HostUseWOL");
-        hostparm.ThisKeepPackage	= gContext->GetSetting("HostKeepPackages");
-        hostparm.ThisMythWelcome	= gContext->GetSetting("HostUseMythWelcome");
-        hostparm.ThisHaveNFS            = gContext->GetSetting("HostHaveCentralNFS");
-        hostparm.ThisNFSserver          = gContext->GetSetting("HostCentralNFSIP");
-        hostparm.ThisNFSmountpoint      = gContext->GetSetting("HostNFSmountpoint");
-        hostparm.ThisHostupdateplan     = gContext->GetSetting("Hostupdateplan");
-        hostparm.ThisShowToolTips       = gContext->GetSetting("HostShowToolTips");
-        hostparm.ThisRunfrontend        = gContext->GetSetting("HostRunFrontend");
-        hostparm.ThisHostZipcode        = gContext->GetSetting("HostZipcode");
-        hostparm.ThisHostncidClient     = gContext->GetSetting("HostncidClient");
-        hostparm.ThisHostncidDaemon     = gContext->GetSetting("HostncidDaemon");
-        hostparm.ThisHostSerialPortncid = gContext->GetSetting("HostSerialPortncid");
-        hostparm.ThisHostbootsplash     = gContext->GetSetting("Hostbootsplash");
-
-        hostparm.ThisXIgnoreConfig      =gContext->GetSetting("HostXIgnoreConfig");
-        hostparm.ThisXcardtype          =gContext->GetSetting("HostXcardtype");
-        hostparm.ThisXUseAdvanced       =gContext->GetSetting("HostXUseAdvanced");
-        hostparm.ThisXIgnoreEDID        =gContext->GetSetting("HostXIgnoreEDID");
-        hostparm.ThisXconnection        =gContext->GetSetting("HostXconnection");
-        hostparm.ThisXDisplaysize       =gContext -> GetSetting("HostXDisplaysize");
-        hostparm.ThisHostXNvidia1080p   =gContext -> GetSetting("HostXNvidia1080p");
-        hostparm.ThisHostXNvidia1080i   =gContext -> GetSetting("HostXNvidia1080i");
-        hostparm.ThisHostXNvidia720p    =gContext -> GetSetting("HostXNvidia720p");
-        hostparm.ThisHostXNvidia480p    =gContext -> GetSetting("HostXNvidia480p");
-//  EDID settings
-        QString tempstring;
-        tempstring = gContext->GetSetting("HostXHsyncLow");
-        tempstring.append(" - ");
-        tempstring.append(gContext->GetSetting("HostXHsyncHigh") );
-        hostparm.ThisXHsync=tempstring;
-        tempstring ="";
-        tempstring=gContext->GetSetting("HostXVrefreshLow");
-        tempstring.append(" - ");
-        tempstring.append(gContext->GetSetting("HostXVrefreshHigh"));
-        hostparm.ThisXVrefresh=tempstring;
-
-//  Assemble the advanced modeline string
-        QString modelinetype = gContext->GetSetting("HostXModelineCatagory");;
-        QString tempmodeline = "HostXadvancedres" + modelinetype ;
-        QString modeline    = gContext ->GetSetting(tempmodeline);
-        hostparm.ThisXresadvanced = modelinetype +"_"+modeline;
-
-//   Gather settings based on card type
-        if ( hostparm.ThisXcardtype == "nVidia" )
-        {
-            hostparm.ThisXTVstandard = gContext->GetSetting("HostXnVidiaTVstandard");
-            hostparm.ThisXTVconnection= gContext->GetSetting("HostXnVidiaTVformat");
-            modelinetype = gContext->GetSetting("HostXNvidiaModelineCatagory");;
-            tempmodeline = "HostXNvidiaadvancedres" + modelinetype ;
-            modeline    = gContext ->GetSetting(tempmodeline);
-            hostparm.ThisXresadvanced = modelinetype +"_"+modeline;
-        }
-        else if  ( hostparm.ThisXcardtype == "ATI" )
-        {
-            hostparm.ThisXTVstandard = gContext->GetSetting("HostXATITVstandard");
-            hostparm.ThisXTVconnection= gContext->GetSetting("HostXati-tvformat");
-        }
-
-
-//*********************************************************************************************
-// AUDIO SETTINGS
-//******************************************************************************************
-    hostparm.ThisHostAudiotype =  gContext ->GetSetting("HostAudiotype");
-    hostparm.ThisHostsyncXine = gContext ->GetSetting("HostsyncXine");
-    hostparm.ThisHostsyncMplayer = gContext ->GetSetting("HostsyncMplayer");
-    hostparm.ThisHostsyncMythMusic = gContext ->GetSetting("HostsyncMythMusic");
-    hostparm.ThisHostsyncMythFrontend = gContext ->GetSetting("HostsyncMythFrontend");
-    hostparm.ThisHostSoundTypeout =  gContext ->GetSetting("HostSoundTypeout") ;
-    hostparm.ThisHostSoundOSSAnalog = gContext ->GetSetting("HostSoundOssAnalog");
-    hostparm.ThisHostSoundOSSDigital = gContext ->GetSetting("HostSoundOssDigital");
-    hostparm.ThisHostSoundALSATypeout =  gContext ->GetSetting("HostSoundALSATypeout") ;
-    hostparm.ThisHostSoundALSAAnalog = gContext ->GetSetting("HostSoundALSAAnalog");
-    hostparm.ThisHostSoundALSADigital = gContext ->GetSetting("HostSoundALSADigital");
-
-    if ( hostparm.ThisHostAudiotype  == "OSS"   )
-    {
-        QString tempdevice;
-        QChar tempchar  ;
-        hostparm.ThisHostSoundDevice = "/dev/dsp";
-        if  ( hostparm.ThisHostSoundTypeout == "Analog" )
-            tempdevice  =  hostparm.ThisHostSoundOSSAnalog ;
-
-        if  ( hostparm.ThisHostSoundTypeout == "Digital" )
-            tempdevice = hostparm.ThisHostSoundOSSDigital ;
-
-        int tlength=(tempdevice.length()  -2 );
-        if  ( tlength > 0  )
-        {
-            tempchar = tempdevice.at( tlength);
-            hostparm.ThisHostSoundDevice.append(tempchar);
-        };
-    }
-
-
-    if ( hostparm.ThisHostAudiotype  == "ALSA"   )
-    {
-        QString tempdevice;
-        hostparm.ThisHostSoundTypeout = hostparm.ThisHostSoundALSATypeout;
-        if (  hostparm.ThisHostSoundTypeout == "Digital" )
-            tempdevice=hostparm.ThisHostSoundALSADigital;
-        if (  hostparm.ThisHostSoundTypeout == "Analog" )
-            tempdevice=hostparm.ThisHostSoundALSAAnalog;
-
-        tempdevice = tempdevice.section( "(", 1,1 );
-        tempdevice = tempdevice.section( ")", 0,0 );
-        hostparm.ThisHostSoundDevice = tempdevice;
-    }
-// Turn off internal audio controls is digital audio is seleced
-    if  ( hostparm.ThisHostSoundTypeout == "Digital" )
-        gContext->SaveSetting("MythControlsVolume","0");
-
-//  LCD TYPE
-    hostparm.ThisHostLCDType = gContext ->GetSetting("HostLCDType");
-    if  ( hostparm.ThisHostLCDType  != "no_lcd" && hostparm.ThisHostLCDType  != "tinker" && hostparm.ThisHostLCDType != "" )
-    {
-        // enable mythtv lcddevice
-        gContext->SaveSetting("LCDEnable","1");
-    };
-// Backupsettings
-        hostparm.ThisHostRemoteBackup = gContext ->GetSetting("HostRemoteBackup");
-        hostparm.ThisHostRemoteBackupDir = gContext ->GetSetting("HostRemoteBackupDir");
-//plugins
-        hostparm.ThisHostpluginmytharchive = gContext->GetSetting("Hostpluginmytharchive");
-        hostparm.ThisHostpluginmythbrowser = gContext->GetSetting("Hostpluginmythbrowser");
-        hostparm.ThisHostpluginmythcontrols = gContext->GetSetting("Hostpluginmythcontrols");
-        hostparm.ThisHostpluginmythflix = gContext->GetSetting("Hostpluginmythflix");
-        hostparm.ThisHostpluginmythgallery = gContext->GetSetting("Hostpluginmythgallery");
-        hostparm.ThisHostpluginmythgame = gContext->GetSetting("Hostpluginmythgame");
-        hostparm.ThisHostpluginmythmovietime = gContext->GetSetting("Hostpluginmythmovietime");
-        hostparm.ThisHostpluginmythmusic = gContext->GetSetting("Hostpluginmythmusic");
-        hostparm.ThisHostpluginmythnews = gContext->GetSetting("Hostpluginmythnews");
-        hostparm.ThisHostpluginmythphone = gContext->GetSetting("Hostpluginmythphone");
-        hostparm.ThisHostpluginmythsmolt = gContext->GetSetting("Hostpluginmythsmolt");
-        hostparm.ThisHostpluginmythvideo = gContext->GetSetting("Hostpluginmythvideo");
-        hostparm.ThisHostpluginmythweather = gContext->GetSetting("Hostpluginmythweather");
-        hostparm.ThisHostpluginmythzoneminder = gContext->GetSetting("Hostpluginmythzoneminder");
-        hostparm.ThisHostpluginmythgameFceu = gContext->GetSetting("HostpluginmythgameFceu");
-        hostparm.ThisHostpluginmythgameZsnes = gContext->GetSetting("HostpluginmythgameZsnes");
-        hostparm.ThisHostpluginmythgameMame = gContext->GetSetting("HostpluginmythgameMame");
-        hostparm.ThisHostpluginmythvideo_dvdcss = gContext->GetSetting("Hostpluginmythvideo_dvdcss");
-        hostparm.ThisHostpluginmythappletrailers= gContext->GetSetting("Hostpluginmythappletrailers");
-        hostparm.ThisHostpluginmythstream= gContext->GetSetting("Hostpluginmythstream");
-        hostparm.ThisHostpluginmythvodka= gContext->GetSetting("Hostpluginmythvodka");
-        hostparm.ThisHostMiro= gContext->GetSetting("HostMiro");
-        hostparm.ThisHostpluginmythgameMednafen= gContext->GetSetting("HostpluginmythgameMednafen");
-        hostparm.ThisHostpluginmythgameROMDB= gContext->GetSetting("HostpluginmythgameROMDB");
-        hostparm.ThisHostXine = gContext->GetSetting("HostXine");
-        hostparm.ThisHostwebmin = gContext->GetSetting("Hostwebmin");
-        hostparm.ThisHostfuppes = gContext->GetSetting("Hostfuppes");
-        hostparm.ThisHostfoldingathome = gContext->GetSetting("Hostfoldingathome");
-        hostparm.ThisHostfoldingusername = gContext->GetSetting("Hostfoldingusername");
-        hostparm.ThisHostfoldingworksize = gContext->GetSetting("Hostfoldingworksize");
-        hostparm.ThisHostDDnslogin = gContext->GetSetting("HostDDnslogin");
-        hostparm.ThisHostDDnspassword = [REDACTED]
-        hostparm.ThisHostDDnshostname = gContext->GetSetting("HostDDnshostname");
-        hostparm.ThisHostDDnsEnable = gContext->GetSetting("HostDDnsEnable");
-        hostparm.ThisHostscreensavertype =  gContext->GetSetting("Hostscreensavertype");
-        hostparm.ThisHostscreensaveridle = gContext->GetSetting("Hostscreensaveridle");
-        if (gContext->GetSetting("HostScreensaverBlank") == "1" )
-            hostparm.ThisHostscreensavertheme="Blank";
-        else if (gContext->GetSetting("HostScreensaverRandom") == "1" )
-            hostparm.ThisHostscreensavertheme="Random";
-        else
-        {
-            if ( hostparm.ThisHostscreensavertype == "gscreensaver" )
-                hostparm.ThisHostscreensavertheme = gContext->GetSetting("HostGScreensavertheme");
-            if ( hostparm.ThisHostscreensavertype == "xscreensaver" )
-                hostparm.ThisHostscreensavertheme = gContext->GetSetting("HostXScreensavertheme");
-        }
-
-        hostparm.ThisHostTransmitproto_1 =
-            gContext->GetSetting("HostTransmitproto_1");
-        hostparm.ThisHostTransmitproto_2 =
-            gContext->GetSetting("HostTransmitproto_2");
-        hostparm.ThisHostTransmitproto_3 =
-            gContext->GetSetting("HostTransmitproto_3");
-        hostparm.ThisHostTransmitproto_4 =
-            gContext->GetSetting("HostTransmitproto_4");
-        hostparm.ThisHostBlasterType =
-            gContext->GetSetting("HostBlasterType");
-        hostparm.ThisHostSerialPort_blasterlirc =
-            gContext->GetSetting("HostSerialPort_blasterlirc");
-        hostparm.ThisHostnumblaster = "1";
-        if ( hostparm.ThisHostBlasterType == "CommandIR" )
-            hostparm.ThisHostnumblaster = "4" ;
-        if ( hostparm.ThisHostBlasterType == "MCE" )
-            hostparm.ThisHostnumblaster = "2" ;
-        hostparm.ThisHOSTrootSSH =  gContext->GetSetting("HOSTrootSSH");
-
-
-
-
-
-//______________________WRITE OUT THE FILE__________________________
-        QString systemheader;
-
-        myfile.open ("/etc/systemconfig");
-        myfile << "hostname=\""     + hostparm.ThisHostName + "\"\n";
-        myfile << "dhcphostname=\"" + hostparm.ThisHostDHCPhostname + "\"\n";
-        myfile << "timezone=\""     + hostparm.ThisTimeZone    	+ "\"\n";
-        myfile << "ip=\""           + hostparm.ThisHostIP           + "\"\n";
-        myfile << "netmask=\"" 		+ hostparm.ThisNETMASK    	+ "\"\n";
-        myfile << "route=\"" 		+ hostparm.ThisGW               + "\"\n";
-        myfile << "nameserver=\"" 	+ hostparm.ThisDNS        	+ "\"\n";
-
-        myfile << "default_interface=\""    + hostparm.ThisHostDefaultInterface          + "\"\n";
-
-        if ( hostparm.ThisHostActiveonbooteth0 == "1" )
-        {
-            systemheader= "\n#Network config for eth0 \n"  ;
-            myfile << systemheader ;
-            myfile << "Hostipeth0=\""   + hostparm.ThisHostIPeth0           + "\"\n";
-            myfile << "Hostnetmasketh0=\""   +hostparm.ThisHostNETMASKeth0      + "\"\n";
-            myfile << "HostDNSeth0=\""   +hostparm.ThisHostDNSeth0          + "\"\n";
-            myfile << "HostUSEDHCPeth0=\""   +hostparm.ThisHostUSEDHCPeth0      + "\"\n";
-            myfile << "HostGWeth0=\""   +hostparm.ThisHostGWeth0            + "\"\n";
-            myfile << "HostActiveeth0=\""   +hostparm.ThisHostActiveonbooteth0      + "\"\n";
-            myfile << "HostESSIDeth0=\"" + hostparm.ThisHOSTESSIDeth0  + "\"\n";
-            myfile << "HostUseEncryptioneth0=\"" + hostparm.ThisHostUseEncryptioneth0 + "\"\n";
-            myfile << "HostKeyeth0=\"" + hostparm.ThisHostkeyeth0         + "\"\n";
-            myfile << "HOST_iswirelesseth0=\"" + hostparm.ThisHOST_iswirelesseth0         + "\"\n";
-            myfile << "HostMTUeth0=\"" + hostparm.ThisHostMTUeth0         + "\"\n";
-        }
-
-        if ( hostparm.ThisHostActiveonbooteth1 == "1" )
-        {
-            systemheader= "\n#Network config for eth1 \n"  ;
-            myfile << systemheader ;
-            myfile << "Hostipeth1=\""   + hostparm.ThisHostIPeth1           + "\"\n";
-            myfile << "Hostnetmasketh1=\""   +hostparm.ThisHostNETMASKeth1      + "\"\n";
-            myfile << "HostDNSeth1=\""   +hostparm.ThisHostDNSeth1          + "\"\n";
-            myfile << "HostUSEDHCPeth1=\""   +hostparm.ThisHostUSEDHCPeth1      + "\"\n";
-            myfile << "HostGWeth1=\""   +hostparm.ThisHostGWeth1            + "\"\n";
-            myfile << "HostActiveeth1=\""   +hostparm.ThisHostActiveonbooteth1      + "\"\n";
-            myfile << "HostESSIDeth1=\"" + hostparm.ThisHOSTESSIDeth1  + "\"\n";
-            myfile << "HostUseEncryptioneth1=\"" + hostparm.ThisHostUseEncryptioneth1 + "\"\n";
-            myfile << "HostKeyeth1=\"" + hostparm.ThisHostkeyeth1         + "\"\n";
-            myfile << "HOST_iswirelesseth1=\"" + hostparm.ThisHOST_iswirelesseth1         + "\"\n";
-            myfile << "HostMTUeth1=\"" + hostparm.ThisHostMTUeth1         + "\"\n";
-        }
-        if ( hostparm.ThisHostActiveonbootwlan0 == "1" )
-        {
-            systemheader= "\n#Network config for wlan0 \n"  ;
-            myfile << systemheader ;
-            myfile << "Hostipwlan0=\""   + hostparm.ThisHostIPwlan0           + "\"\n";
-            myfile << "Hostnetmaskwlan0=\""   +hostparm.ThisHostNETMASKwlan0      + "\"\n";
-            myfile << "HostDNSwlan0=\""   +hostparm.ThisHostDNSwlan0          + "\"\n";
-            myfile << "HostUSEDHCPwlan0=\""   +hostparm.ThisHostUSEDHCPwlan0      + "\"\n";
-            myfile << "HostGWwlan0=\""   +hostparm.ThisHostGWwlan0            + "\"\n";
-            myfile << "HostActivewlan0=\""   +hostparm.ThisHostActiveonbootwlan0      + "\"\n";
-            myfile << "HostESSIDwlan0=\"" + hostparm.ThisHOSTESSIDwlan0  + "\"\n";
-            myfile << "HostUseEncryptionwlan0=\"" + hostparm.ThisHostUseEncryptionwlan0 + "\"\n";
-            myfile << "HostKeywlan0=\"" + hostparm.ThisHostkeywlan0         + "\"\n";
-            myfile << "HOST_iswirelesswlan0=\"" + hostparm.ThisHOST_iswirelesswlan0         + "\"\n";
-            myfile << "HostMTUwlan0=\"" + hostparm.ThisHostMTUwlan0         + "\"\n";
-        }
-        if ( hostparm.ThisHostActiveonbootwlan1 == "1" )
-        {
-            systemheader= "\n#Network config for wlan1 \n"  ;
-            myfile << systemheader ;
-            myfile << "Hostipwlan1=\""   + hostparm.ThisHostIPwlan1           + "\"\n";
-            myfile << "Hostnetmaskwlan1=\""   +hostparm.ThisHostNETMASKwlan1      + "\"\n";
-            myfile << "HostDNSwlan1=\""   +hostparm.ThisHostDNSwlan1          + "\"\n";
-            myfile << "HostUSEDHCPwlan1=\""   +hostparm.ThisHostUSEDHCPwlan1      + "\"\n";
-            myfile << "HostGWwlan1=\""   +hostparm.ThisHostGWwlan1            + "\"\n";
-            myfile << "HostActivewlan1=\""   +hostparm.ThisHostActiveonbootwlan1      + "\"\n";
-            myfile << "HostESSIDwlan1=\"" + hostparm.ThisHOSTESSIDwlan1  + "\"\n";
-            myfile << "HostUseEncryptionwlan1=\"" + hostparm.ThisHostUseEncryptionwlan1 + "\"\n";
-            myfile << "HostKeywlan1=\"" + hostparm.ThisHostkeywlan1         + "\"\n";
-            myfile << "HOST_iswirelesswlan1=\"" + hostparm.ThisHOST_iswirelesswlan1         + "\"\n";
-            myfile << "HostMTUwlan1=\"" + hostparm.ThisHostMTUwlan1         + "\"\n";
-        }
-
-      if ( hostparm.ThisHostActiveonbootath0 == "1" )
-        {
-            systemheader= "\n#Network config for ath0 \n"  ;
-            myfile << systemheader ;
-            myfile << "Hostipath0=\""   + hostparm.ThisHostIPath0           + "\"\n";
-            myfile << "Hostnetmaskath0=\""   +hostparm.ThisHostNETMASKath0      + "\"\n";
-            myfile << "HostDNSath0=\""   +hostparm.ThisHostDNSath0          + "\"\n";
-            myfile << "HostUSEDHCPath0=\""   +hostparm.ThisHostUSEDHCPath0      + "\"\n";
-            myfile << "HostGWath0=\""   +hostparm.ThisHostGWath0            + "\"\n";
-            myfile << "HostActiveath0=\""   +hostparm.ThisHostActiveonbootath0      + "\"\n";
-            myfile << "HostESSIDath0=\"" + hostparm.ThisHOSTESSIDath0  + "\"\n";
-            myfile << "HostUseEncryptionath0=\"" + hostparm.ThisHostUseEncryptionath0 + "\"\n";
-            myfile << "HostKeyath0=\"" + hostparm.ThisHostkeyath0         + "\"\n";
-            myfile << "HOST_iswirelessath0=\"" + hostparm.ThisHOST_iswirelessath0         + "\"\n";
-            myfile << "HostMTUath0=\"" + hostparm.ThisHostMTUath0         + "\"\n";
-        }
-
-
-        systemheader= "\n#Misc \n"  ;
-        myfile << systemheader ;
-        myfile << "UseSamba=\""		+ hostparm.ThisSamba      	+ "\"\n";
-        myfile << "Samba_media=\"" +  hostparm.ThisHostServiceSamba_media + "\"\n";
-        myfile << "Samba_mediareadonly=\"" +  hostparm.ThisHostServiceSamba_write + "\"\n";
-        myfile << "Samba_home=\"" +  hostparm.ThisHostServiceSamba_home + "\"\n";
-        myfile << "Samba_homereadonly=\"" +  hostparm.ThisHostServiceSamba_writehome + "\"\n";
-        myfile << "Samba_domain=\"" + hostparm.ThisHostServiceSamba_domain + "\"\n";
-        myfile << "UseHobbit=\"" +  hostparm.ThisHostServiceHobbit + "\"\n";
-        myfile << "UseRRD=\"" +  hostparm.ThisHostServiceRRD + "\"\n";
-        myfile << "UseNFS=\"" 		+ hostparm.ThisNFS             	+ "\"\n";
-        myfile << "UseMythWEB=\"" 	+ hostparm.ThisMythWEB     	+ "\"\n";
-        myfile << "UseMythWEB_auth=\""   + hostparm.ThisHostwebauth      + "\"\n";
-        myfile << "UseDHCP=\"" 	 	+ hostparm.ThisDHCP          	+ "\"\n";
-        myfile << "RunDHCP=\""      + hostparm.ThisHostRunDHCP             + "\"\n";
-        myfile << "SystemType=\"" 	+ hostparm.ThisSystemType 	+ "\"\n";
-
-        myfile << "UseEvrouter=\"" + hostparm.ThisHostUseEvrouter + "\"\n";
-        myfile << "EvrouterConfig=\"" + hostparm.ThisHostEvrouterConfig + "\"\n";
-        myfile << "dbhost=\""		+ hostparm.ThisDBhost         	+ "\"\n";
-        myfile << "Xres=\"" 		+ hostparm.ThisXres             + "\"\n";
-        myfile << "AutoShutdown=\""	+ hostparm.ThisAutodown		+ "\"\n";
-        myfile << "Shutdowntime=\""	+ hostparm.ThisShutdowntime	+ "\"\n";
-        myfile << "Shutdowntime2=\"" + hostparm.ThisShutdowntime2 + "\"\n";
-        myfile << "Wakeuptime=\""	+ hostparm.ThisWakeuptime	+ "\"\n";
-        myfile << "UseNVRAM=\""		+ hostparm.ThisUseNVRAM		+ "\"\n";
-        myfile << "UseWOL=\""		+ hostparm.ThisUseWOL		+ "\"\n";
-        myfile << "KeepPackages=\""	+ hostparm.ThisKeepPackage	+ "\"\n";
-        myfile << "UseMythWelcome=\""	+ hostparm.ThisMythWelcome	+ "\"\n";
-        myfile << "HaveCentralNFS=\""   + hostparm.ThisHaveNFS          + "\"\n";
-        myfile << "NFSserver=\""        + hostparm.ThisNFSserver        + "\"\n";
-        myfile << "NFSmount=\""         + hostparm.ThisNFSmountpoint    + "\"\n";
-        myfile << "Hostupdateplan=\""   + hostparm.ThisHostupdateplan   + "\"\n";
-        myfile << "ShowTips=\""         + hostparm.ThisShowToolTips     + "\"\n";
-        myfile << "PKG_MIRROR=\""       + hostparm.ThisHostPKG_MIRROR   + "\"\n";
-        myfile << "RunFrontend=\""      + hostparm.ThisRunfrontend      + "\"\n";
-        myfile << "zipcode=\""          + hostparm.ThisHostZipcode + "\"\n";
-        myfile << "ncidclient=\""       + hostparm.ThisHostncidClient + "\"\n";
-        myfile << "Runncidd=\""        + hostparm.ThisHostncidDaemon +  "\"\n";
-        myfile <<  "nciddSerialPort=\""      + hostparm.ThisHostSerialPortncid +  "\"\n";
-        myfile << "Usebootsplash=\""        + hostparm.ThisHostbootsplash + "\"\n";
-        myfile << "LCDtype=\"" + hostparm.ThisHostLCDType + "\"\n";
-        myfile << "RemoteBackup=\"" + hostparm.ThisHostRemoteBackup + "\"\n";
-        myfile << "RemoteBackupDir=\"" + hostparm.ThisHostRemoteBackupDir + "\"\n";
-
-
-        systemheader= "\n#X display settings \n"  ;
-        myfile << systemheader ;
-        myfile << "XIgnoreConfig=\""        + hostparm.ThisXIgnoreConfig    + "\"\n";
-        myfile << "Xcardtype=\""              + hostparm.ThisXcardtype     + "\"\n";
-        myfile << "XUseAdvanced=\""       + hostparm.ThisXUseAdvanced + "\"\n";
-        myfile << "XIgnoreEDID=\""         + hostparm.ThisXIgnoreEDID  + "\"\n";
-        myfile << "Xconnection=\""           + hostparm.ThisXconnection  + "\"\n";
-        myfile << "XHsync=\""                  + hostparm.ThisXHsync  + "\"\n";
-        myfile << "XVrefresh=\""              + hostparm.ThisXVrefresh+ "\"\n";
-        myfile << "Xresadvanced=\""        + hostparm.ThisXresadvanced + "\"\n";
-        myfile << "XTVstandard=\""         +  hostparm.ThisXTVstandard +  "\"\n";
-        myfile << "XTVconnection=\""      +  hostparm.ThisXTVconnection +  "\"\n";
-        myfile << "XDisplaysize=\""         + hostparm.ThisXDisplaysize + "\"\n";
-        myfile << "XnVidia1080p=\""         + hostparm.ThisHostXNvidia1080p+ "\"\n";
-        myfile << "XnVidia1080i=\""         + hostparm.ThisHostXNvidia1080i+ "\"\n";
-        myfile << "XnVidia720p=\""         + hostparm.ThisHostXNvidia720p+ "\"\n";
-        myfile << "XnVidia480p=\""         + hostparm.ThisHostXNvidia480p+ "\"\n";
-
-        systemheader= "\n#Audio settings\n"  ;
-        myfile << systemheader ;
-        myfile << "Audiotype=\""            + hostparm.ThisHostAudiotype + "\"\n";
-        myfile << "Audiotypeout=\""            + hostparm.ThisHostSoundTypeout + "\"\n";
-        myfile << "SoundDevice=\""    + hostparm.ThisHostSoundDevice+  "\"\n";
-        myfile << "syncXine=\""   + hostparm.ThisHostsyncXine + "\"\n";
-        myfile << "syncMplayer=\""   + hostparm.ThisHostsyncMplayer + "\"\n";
-        myfile << "syncMythMusic=\""   + hostparm.ThisHostsyncMythMusic + "\"\n";
-        myfile << "syncMythFrontend=\""   + hostparm.ThisHostsyncMythFrontend + "\"\n";
-
-
-        systemheader= "\n#Software settings\n"  ;
-        myfile << systemheader ;
-        myfile << "mytharchive=\"" + hostparm.ThisHostpluginmytharchive + "\"\n";
-        myfile << "mythbrowser=\"" + hostparm.ThisHostpluginmythbrowser + "\"\n";
-        myfile << "mythcontrols=\"" + hostparm.ThisHostpluginmythcontrols + "\"\n";
-        myfile << "mythflix=\"" + hostparm.ThisHostpluginmythflix + "\"\n";
-        myfile << "mythgallery=\"" + hostparm.ThisHostpluginmythgallery + "\"\n";
-        myfile << "mythgame=\"" + hostparm.ThisHostpluginmythgame + "\"\n";
-        myfile << "mythmovietime=\"" + hostparm.ThisHostpluginmythmovietime + "\"\n";
-        myfile << "mythmusic=\"" + hostparm.ThisHostpluginmythmusic + "\"\n";
-        myfile << "mythnews=\"" + hostparm.ThisHostpluginmythnews + "\"\n";
-        myfile << "mythphone=\"" + hostparm.ThisHostpluginmythphone + "\"\n";
-        myfile << "mythsmolt=\"" + hostparm.ThisHostpluginmythsmolt + "\"\n";
-        myfile << "mythvideo=\"" + hostparm.ThisHostpluginmythvideo + "\"\n";
-        myfile << "mythweather=\"" + hostparm.ThisHostpluginmythweather + "\"\n";
-        myfile << "mythzoneminder=\"" + hostparm.ThisHostpluginmythzoneminder + "\"\n";
-
-        myfile << "fceu=\"" + hostparm.ThisHostpluginmythgameFceu + "\"\n";
-        myfile << "zsnes=\"" + hostparm.ThisHostpluginmythgameZsnes + "\"\n";
-        myfile << "mame=\"" + hostparm.ThisHostpluginmythgameMame + "\"\n";
-        myfile << "dvdcss=\"" + hostparm.ThisHostpluginmythvideo_dvdcss + "\"\n";
-
-        myfile << "mythappletrailers=\"" + hostparm.ThisHostpluginmythappletrailers + "\"\n";
-        myfile << "mythstream=\"" + hostparm.ThisHostpluginmythstream + "\"\n";
-        myfile << "mythvodka=\"" +hostparm.ThisHostpluginmythvodka + "\"\n";
-        myfile << "miro=\"" + hostparm.ThisHostMiro + "\"\n";
-        myfile << "mednafen=\"" + hostparm.ThisHostpluginmythgameMednafen + "\"\n";
-        myfile << "romdb=\"" + hostparm.ThisHostpluginmythgameROMDB + "\"\n";
-        myfile << "xine=\"" + hostparm.ThisHostXine  + "\"\n";
-        myfile << "webmin=\"" + hostparm.ThisHostwebmin  + "\"\n";
-        myfile << "fuppes=\"" + hostparm.ThisHostfuppes  + "\"\n";
-        myfile << "foldingathome=\"" + hostparm.ThisHostfoldingathome  + "\"\n";
-        myfile << "foldingusername=\"" + hostparm.ThisHostfoldingusername  + "\"\n";
-        myfile << "foldingworksize=\"" + hostparm.ThisHostfoldingworksize  + "\"\n";
-
-
-
-        myfile << "DDnslogin=\"" +     hostparm.ThisHostDDnslogin + "\"\n";
-        myfile << "DDnspassword=\"" + hostparm.ThisHostDDnspassword + "\"\n";
-        myfile << "DDnshostname=\"" +   hostparm.ThisHostDDnshostname + "\"\n";
-        myfile << "DDnsEnable=\"" +    hostparm.ThisHostDDnsEnable + "\"\n";
-        myfile << "Screensavertype=\"" + hostparm.ThisHostscreensavertype + "\"\n";
-        myfile << "Screensaveridle=\"" + hostparm.ThisHostscreensaveridle + "\"\n";
-        myfile << "Screensavertheme=\"" + hostparm.ThisHostscreensavertheme + "\"\n";
-
-        systemheader="\n#IR settings\n"  ;
-        myfile << systemheader ;
-        myfile << "Remotetype=\""     + hostparm.ThisRemote       + "\"\n";
-        //myfile << "Blastertype=\""  + hostparm.ThisBlaster      + "\"\n";
-        myfile << "ReceiverType=\"" + hostparm.ThisReceiverType     + "\"\n";
-        myfile << "HostLircWait=\"" + hostparm.ThisHostLircWait + "\"\n";
-        myfile << "ReceiverSerialport=\"" + hostparm.ThisHostSerialPortlirc + "\"\n";
-        myfile << "HostTransmitproto_1=\"" +  hostparm.ThisHostTransmitproto_1 + "\"\n";
-        myfile << "HostTransmitproto_2=\"" +  hostparm.ThisHostTransmitproto_2 + "\"\n";
-        myfile << "HostTransmitproto_3=\"" +  hostparm.ThisHostTransmitproto_3 + "\"\n";
-        myfile << "HostTransmitproto_4=\"" +  hostparm.ThisHostTransmitproto_4 + "\"\n";
-
-        myfile << "HostBlasterType=\"" + hostparm.ThisHostBlasterType + "\"\n";
-        myfile << "HostSerialPort_blasterlirc=\"" +  hostparm.ThisHostSerialPort_blasterlirc + "\"\n";
-        myfile << "Hostnumblaster=\"" + hostparm.ThisHostnumblaster + "\"\n";
-        myfile << "rootSSH=\"" + hostparm.ThisHOSTrootSSH  + "\"\n";
-
-    myfile.close();
-
-}
-
-
-MythInstallSettings::MythInstallSettings()
-{
-    VerticalConfigurationGroup* vcg =   new VerticalConfigurationGroup(false,false,true,true);
-    VerticalConfigurationGroup* denied =  new VerticalConfigurationGroup(false,false,true,true);
-    TransLabelSetting *deniedlabel = new TransLabelSetting();
-    deniedlabel->setValue("                You do not have access to this screen  " );              denied->addChild(deniedlabel);
-    if  ( displaymysqlonly  )
-        {
-            vcg->addChild(HostMysqlserverip_listbox());
-            vcg->addChild(ThemePainter());
-            addChild(vcg);
-        }
-        else
-        {
-            vcg->setLabel(QObject::tr("Host Settings"));
-            // Check to see if screen should appear
-            if ( displayshownetwork )
-            {
-            //Check to see if screen is allowed to appear
-                if (  ((gContext->GetSetting("Hostaccessnetwork"))  == "0" )  )
-                    {
-                        denied ->setLabel(QObject::tr("Host Settings"));
-                        addChild(denied);
-                    }
-                else
-                {
-
-                    hostparm.ThisHostnetOLD = gContext ->GetSetting("HostNetDevice");
-                    QString s = "HostActiveonboot";
-                    s+=hostparm.ThisHostnetOLD;
-                    hostparm.ThisHostnetActiveOLD = gContext ->GetSetting(s);
-                    MSqlQuery query(MSqlQuery::InitCon());
-                    query.prepare( "delete from settings where  hostname=:HOSTNAME  and value = 'HOSTNetDevice';  "  );
-                    query.bindValue( ":HOSTNAME" ,   gContext->GetHostName()  );
-                    query.exec();
-
-
-                    VerticalConfigurationGroup* networksettings =  new VerticalConfigurationGroup(false,true    ,false,false);
-                    networksettings->addChild(HostMyhostname());
-                    networksettings->addChild(HostDHCPHostname());
-                    networksettings ->setLabel(QObject::tr("Network Settings Page (1/2)"));
-
-                    NetworkSettingsFrame *netsettingsframe = new NetworkSettingsFrame();
-                    addChild(networksettings);
-                    addChild(netsettingsframe);
-
-                };
-            }
-
-            if ( displayshowhostype )
-            {
-            if (  ((gContext->GetSetting("Hostaccesshostype")) =="0" ))
-                {
-                    denied ->setLabel(QObject::tr("System type"));
-                    addChild(denied);
-                }
-                else
-                {
-                    SystemtypeGroup *systemtypegroup = new SystemtypeGroup();
-                    vcg->addChild(systemtypegroup);
-                    addChild(vcg);
-                }
-            }
-
-            if ( displayshowmisc )
-            {
-            if ( ((gContext->GetSetting("Hostaccessmisc")) == "0" ))
-                {
-                    denied ->setLabel(QObject::tr("NFS Settings"));
-                    addChild(denied);
-                }
-                else
-                {
-                     MiscMainFrame *miscsettings = new MiscMainFrame();
-                    MiscMainFrame2 *miscsettings2 = new MiscMainFrame2();
-                     addChild(miscsettings);
-                     addChild(miscsettings2);
-                }
-            }
-            if ( displayshowshutdown )
-            {
-                if ( ((gContext->GetSetting("Hostaccesssleep")) == "0" ))
-                {
-                    denied ->setLabel(QObject::tr("WOL settings"));
-                    addChild(denied);
-                }
-                else
-                {
-                    WakeSettings *wakesettings = new WakeSettings();
-                    addChild(wakesettings);
-                }
-            }
-            if ( displayshowadvanced )
-            {
-                if ( ((gContext->GetSetting("Hostaccessadvanced")) == "0" ) )
-                {
-                    denied ->setLabel(QObject::tr("Advaned Settings"));
-                    addChild(denied);
-                }
-                else
-                {
-                    AdvancedSettings *advancedsettings = new AdvancedSettings();
-                    AdvancedSettings_2 *advancedsettings_2 = new AdvancedSettings_2();
-
-                   // Screensaverhostsettings  *advancedsettings_3 = new Screensaverhostsettings();
-//                     advancedsettings_3 ->setLabel(QObject::tr("Advanced settings page 3"));
-
-
-                    addChild(advancedsettings);
-                    addChild(advancedsettings_2);
-                 //   addChild(advancedsettings_3);
-                }
-            }
-            if ( displayshowsound )
-            {
-                if ( ((gContext->GetSetting("Hostaccesssound")) =="0") )
-                {
-                    denied ->setLabel(QObject::tr("Sound Settings"));
-                    addChild(denied);
-                }
-                else
-                {
-                    //remove old sound card setting from the db.  This is useful for when the saved setting is no longer valid for this machine.
-                    // Later search the list and set the value to the old setting if found in the dropdown.
-                    hostparm.OLDHostSoundOSSAnalog = gContext ->GetSetting("HostSoundOssAnalog");
-                    hostparm.OLDHostSoundOSSDigital = gContext ->GetSetting("HostSoundOssDigital");
-                    hostparm.OLDHostSoundALSAAnalog = gContext ->GetSetting("HostSoundALSAAnalog");
-                    hostparm.OLDHostSoundALSADigital= gContext ->GetSetting("HostSoundALSADigital");
-
-
-                    MSqlQuery query(MSqlQuery::InitCon());
-                    query.prepare( "delete from settings where  hostname=:HOSTNAME  and value = 'HOSTSoundOssAnalog';  "  );
-                    query.bindValue( ":HOSTNAME" ,   gContext->GetHostName()  );
-                    query.exec();
-                    query.prepare( "delete from settings where  hostname=:HOSTNAME  and value = 'HOSTSoundALSAAnalog';  "  );
-                    query.bindValue( ":HOSTNAME" ,   gContext->GetHostName()  );
-                    query.exec();
-                    query.prepare( "delete from settings where  hostname=:HOSTNAME  and value = 'HOSTSoundALSADigital';  "  );
-                    query.bindValue( ":HOSTNAME" ,   gContext->GetHostName()  );
-                    query.exec();
-                    query.prepare( "delete from settings where  hostname=:HOSTNAME  and value = 'HOSTSoundOssDigital';  "  );
-                    query.bindValue( ":HOSTNAME" ,   gContext->GetHostName()  );
-                    query.exec();
-
-
-                    SoundSettings *soundsettings = new SoundSettings();
-                    addChild(soundsettings);
-                }
-            }
-            if ( displayshowadvancedX )
-            {
-                if ( ((gContext->GetSetting("HostaccessadvancedX")) == "0" ))
-                {
-                    denied ->setLabel(QObject::tr("AdvancedX Settings"));
-                    addChild(denied);
-                    }
-                    else
-                    {
-                        AdvancedXSettings *advancedXsettings = new AdvancedXSettings();
-                        addChild(advancedXsettings);
-                    }
-            }
-            if ( displayaccesscontrol )
-            {
-                VerticalConfigurationGroup* accessettings =
-                     new VerticalConfigurationGroup(false, true,false,false);;
-                ConfigurationGroup *GridAccess =
-                    new GridConfigurationGroup(2,false,false,false,false);
-
-                GridAccess->addChild(Hostaccessmisc());
-                GridAccess->addChild(Hostaccesssleep());
-                GridAccess->addChild(Hostaccessadvanced());
-                GridAccess->addChild(HostaccessadvancedX());
-                GridAccess->addChild(Hostaccesssound());
-                GridAccess->addChild(Hostaccessplugins());
-//                GridAccess->addChild(Hostaccessuser());
-                GridAccess->addChild(Hostaccesswebuser());
-
-                accessettings->addChild(Hostaccessnetwork());
-                accessettings->addChild(new ACCESShostsettings);
-                accessettings->addChild(GridAccess);
-                accessettings ->setLabel(QObject::tr("Access control"));
-                addChild(accessettings);
-            }
-
-            if ( displayplugins )
-            {
-                if ( ((gContext->GetSetting("Hostaccessplugins")) == "0" ))
-                {
-                    denied ->setLabel(QObject::tr("Plugins"));
-                    addChild(denied);
-                }
-                else
-                {
-                    ConfigurationGroup *GridShowPlugin = new GridConfigurationGroup(2);
-                    GridShowPlugin->addChild(Hostpluginmytharchive());
-                    GridShowPlugin->addChild(Hostpluginmythbrowser());
-                    GridShowPlugin->addChild(Hostpluginmythcontrols());
-                    GridShowPlugin->addChild(Hostpluginmythflix());
-                    GridShowPlugin->addChild(Hostpluginmythgallery());
-                    GridShowPlugin->addChild(Hostpluginmythmovietime());
-
-                    ConfigurationGroup *GridShowPlugin2 = new GridConfigurationGroup(2);
-                    GridShowPlugin2->addChild(Hostpluginmythmusic());
-                    GridShowPlugin2->addChild(Hostpluginmythnews());
-                    GridShowPlugin2->addChild(Hostpluginmythphone());
-                    GridShowPlugin2->addChild(Hostpluginmythsmolt());
-                    GridShowPlugin2->addChild(Hostpluginmythweather());
-                    GridShowPlugin2->addChild(Hostpluginmythzoneminder());
-
-                    ConfigurationGroup *GridShowPlugin4 = new GridConfigurationGroup(2);
-                    GridShowPlugin4->addChild(Hostpluginmythappletrailers());
-                    GridShowPlugin4->addChild(Hostpluginmythstream());
-                    GridShowPlugin4->addChild(Hostpluginmythvodka());
-                    GridShowPlugin4->addChild(HostMiro());
-                    GridShowPlugin4->addChild(HostXine());
-                    GridShowPlugin4->addChild(Hostwebmin());
-
-                    ConfigurationGroup *GridShowPlugin5 = new GridConfigurationGroup(2);
-                    GridShowPlugin5->addChild(Hostfuppes());
-
-		    ConfigurationGroup *GridShowPlugin6 = new VerticalConfigurationGroup(true,true);
-                    GridShowPlugin6->addChild(Hostfoldingathome());
-                    GridShowPlugin6->addChild(Hostfoldingusername());
-                    GridShowPlugin6->addChild(Hostfoldingworksize());
-
-                    ConfigurationGroup *Mythvideoplugin = new HorizontalConfigurationGroup();
-                        Mythvideoplugin->addChild(Hostpluginmythvideo());
-                        Mythvideoplugin->addChild(Hostpluginmythvideo_dvdcss());
-
-
-                    ConfigurationGroup *GridShowPlugin3 = new VerticalConfigurationGroup(true,true);
-                    GridShowPlugin3->addChild(new MythGamesettings);
-                    GridShowPlugin3->addChild(Mythvideoplugin);
-
-
-
-                    addChild(GridShowPlugin);
-                    addChild(GridShowPlugin2);
-                    addChild(GridShowPlugin3);
-                    addChild(GridShowPlugin4);
-                    addChild(GridShowPlugin5);
-                    addChild(GridShowPlugin6);
-                }
-            }
-            if ( displayuser )
-            {
-                if ( ((gContext->GetSetting("Hostaccessuser")) == "0" ))
-                {
-                    denied ->setLabel(QObject::tr("User Management"));
-                    addChild(denied);
-                }
-                else
-                {
-                    UserManagement *usermanagement = new UserManagement();
-                    addChild(usermanagement);
-                }
-            }
-
-            if ( displaywebuser )
-            {
-                if ( ((gContext->GetSetting("Hostaccesswebuser")) == "0" ))
-                {
-                    denied ->setLabel(QObject::tr("Web security"));
-                    addChild(denied);
-                }
-                else
-                {
-                    WebPasswordFrame *webpasswordframe = new WebPasswordFrame();
-                    addChild(webpasswordframe);
-
-                }
-
-            }
-            if ( displayddns )
-            {
-                if ( ((gContext->GetSetting("Hostaccessddns")) == "0" ))
-                {
-                    denied ->setLabel(QObject::tr("DDNS security"));
-                    addChild(denied);
-                }
-                else
-                {
-                    DDnssettings *ddnsframe = new DDnssettings();
-                    addChild(ddnsframe);
-                }
-            }
-            if ( displayinfrared )
-            {
-//                 if ( ((gContext->GetSetting("Hostaccessddns")) == "0" ))
-//                 {
-//                     denied ->setLabel(QObject::tr("DDNS security"));
-//                     addChild(denied);
-//                 }
-//                 else
-//                 {
-                    VERBOSE(VB_IMPORTANT, "LIRC");
-                    IRFrame *irframe = new IRFrame();
-                    IR_TransmitFrame *transmitframe =  new IR_TransmitFrame();
-                    LCDFrame     *lcdframe = new LCDFrame();
-                    addChild(irframe);
-                    addChild(transmitframe);
-                    addChild(lcdframe);
-                //}
-            }
-            if ( displayscreensaver )
-            {
-//                 if ( ((gContext->GetSetting("Hostaccessddns")) == "0" ))
-//                 {
-//                     denied ->setLabel(QObject::tr("DDNS security"));
-//                     addChild(denied);
-//                 }
-//                 else
-//                 {
-                    VERBOSE(VB_IMPORTANT, "screensaver");
-                    Screensaverhostsettings  *screensaver = new Screensaverhostsettings();
-                    addChild(screensaver);
-                //}
-            }
-        }
-
-};
-
diff --git a/abs/core-testing/mythinstall/installsettings.h b/abs/core-testing/mythinstall/installsettings.h
deleted file mode 100755
index 0df1d4e..0000000
--- a/abs/core-testing/mythinstall/installsettings.h
+++ /dev/null
@@ -1,489 +0,0 @@
-#ifndef WELCOMESETTINGS_H
-#define WELCOMESETTINGS_H
-
-#include <settings.h>
-#include "mythdialogs.h"
-#include "libmyth/mythdialogs.h"
-#include "libmyth/mythwidgets.h"
-
-
-class SystemtypeGroup: public TriggeredConfigurationGroup {
-Q_OBJECT
-public:
-  SystemtypeGroup();
-  HostComboBox  *HostSystemType;
-public slots:
-        void SystemtypeHelp();
-};
-
-//-------------------------------------------
-class NetworkSettingseth0:
-                    public TriggeredConfigurationGroup {
-Q_OBJECT
-public:
-    NetworkSettingseth0();
-
-   HostLineEdit *HostIPeth0;
-   HostComboBox *HostNETMASKeth0;
-   HostLineEdit *HostGWeth0;
-   HostLineEdit *HostDNSeth0;
-   HostCheckBox *HostActiveonbooteth0;
-   HostCheckBox *HostUseDHCPeth0 ;
-   HostCheckBox *HostDefaulteth0;
-   TransButtonSetting *wirelessbuttoneth0;
-
-signals:
-      void eth0_is_default(void);
-public slots:
-    void eth0_wireless_settings();
-    void eth0_disable_others();
-    void eth0_disabled();
-    void eth0_wireless_disable();
-};
-
-class eth0options : public ConfigurationWizard
-{
-public:
-    eth0options();
-};
-
-
-class NetworkSettingseth1:
-                    public TriggeredConfigurationGroup {
-Q_OBJECT
-public:
-    NetworkSettingseth1();
-
-   HostLineEdit  *HostIPeth1;
-   HostComboBox *HostNETMASKeth1;
-   HostLineEdit *HostGWeth1;
-   HostLineEdit *HostDNSeth1;
-   HostCheckBox *HostActiveonbooteth1;
-   HostCheckBox *HostUseDHCPeth1 ;
-   HostCheckBox *HostDefaulteth1;
-   TransButtonSetting *wirelessbuttoneth1;
-signals:
-      void eth1_is_default(void);
-public slots:
-    void eth1_wireless_settings();
-    void eth1_disable_others();
-    void eth1_disabled();
-    void eth1_wireless_disable();
-};
-
-class eth1options : public ConfigurationWizard
-{
-public:
-    eth1options();
-};
-
-
-
-class NetworkSettingswlan0:
-                    public TriggeredConfigurationGroup {
-Q_OBJECT
-public:
-    NetworkSettingswlan0();
-
-   HostLineEdit  *HostIPwlan0;
-   HostComboBox *HostNETMASKwlan0;
-   HostLineEdit *HostGWwlan0;
-   HostLineEdit *HostDNSwlan0;
-   HostCheckBox *HostActiveonbootwlan0;
-   HostCheckBox *HostUseDHCPwlan0 ;
-   HostCheckBox *HostDefaultwlan0;
-   TransButtonSetting *wirelessbuttonwlan0;
-signals:
-      void wlan0_is_default(void);
-public slots:
-    void wlan0_wireless_settings();
-    void wlan0_disable_others();
-    void wlan0_disabled();
-    void wlan0_wireless_disable();
-};
-
-class Wlan0options : public ConfigurationWizard
-{
-public:
-    Wlan0options();
-};
-
-
-class NetworkSettingswlan1:
-                    public TriggeredConfigurationGroup {
-Q_OBJECT
-public:
-    NetworkSettingswlan1();
-
-   HostLineEdit *HostIPwlan1;
-   HostComboBox *HostNETMASKwlan1;
-   HostLineEdit *HostGWwlan1;
-   HostLineEdit *HostDNSwlan1;
-   HostCheckBox *HostActiveonbootwlan1;
-   HostCheckBox *HostUseDHCPwlan1 ;
-   HostCheckBox *HostDefaultwlan1;
-   TransButtonSetting *wirelessbuttonwlan1;
-signals:
-      void wlan1_is_default(void);
-public slots:
-    void wlan1_wireless_settings();
-    void wlan1_disable_others();
-    void wlan1_disabled();
-    void wlan1_wireless_disable();
-};
-
-class wlan1options : public ConfigurationWizard
-{
-public:
-    wlan1options();
-};
-
-
-
-class NetworkSettingsath0:
-                    public TriggeredConfigurationGroup {
-Q_OBJECT
-public:
-    NetworkSettingsath0();
-
-   HostLineEdit *HostIPath0;
-   HostComboBox *HostNETMASKath0;
-   HostLineEdit *HostGWath0;
-   HostLineEdit *HostDNSath0;
-   HostCheckBox *HostActiveonbootath0;
-   HostCheckBox *HostUseDHCPath0 ;
-   HostCheckBox *HostDefaultath0;
-   TransButtonSetting *wirelessbuttonath0;
-signals:
-      void ath0_is_default(void);
-public slots:
-    void ath0_wireless_settings();
-    void ath0_disable_others();
-    void ath0_disabled();
-    void ath0_wireless_disable();
-};
-
-class ath0options : public ConfigurationWizard
-{
-public:
-    ath0options();
-};
-
-
-
-//--------------------------------------------
-
-
-class SoundSettings:    public TriggeredConfigurationGroup {
-Q_OBJECT
-public:
-    SoundSettings();
-    HostComboBox *HostAudiotype;
-    HostCheckBox *HostsyncXine;
-    HostCheckBox *HostsyncMplayer;
-    HostCheckBox *HostsyncMythMusic;
-    HostCheckBox *HostsyncMythFrontend;
-
-
-signals:
-        void oss_sig(void);
-        void alsa_sig(void);
-public slots:
-    void soundossgathersettings_1();
-    void soundalsagathersettings_1();
-
-};
-
-
-class SoundOSSsettings: public TriggeredConfigurationGroup {
-Q_OBJECT
-public:
-    SoundOSSsettings();
-    HostComboBox *HostSoundOssAnalog;
-    HostComboBox *HostSoundOssDigital;
-    HostComboBox *HostSoundTypeout;
-    void fillossselection();
-public slots:
-    void soundossgathersettings();
-    void loadossdriver();
-};
-
-class SoundALSAsettings: public TriggeredConfigurationGroup {
-Q_OBJECT
-public:
-    SoundALSAsettings();
-    HostComboBox *HostSoundALSAAnalog;
-    HostComboBox *HostSoundALSADigital;
-    HostComboBox *HostSoundALSATypeout;
-    void fillALSAselection();
-public slots:
-    void soundalsagathersettings();
-    void loadalsadriver();
-
-};
-
-
-//############################################
-class MythInstallSettings:  public ConfigurationWizard
-{
-
-public:
-    MythInstallSettings();
-    void testme();
-private:
-    MythPopupBox *popup;
-
-};
-
-
-
-
-class HostRemoteType: public HostImageSelect {
-public:
-    HostRemoteType();
-};
-
-
-
-#define MV_ROOT "/usr/MythVantage/"
-int runsettings(bool = false , bool = false ,  bool = false ,bool = false ,bool = false, bool = false,bool = false,bool = false , bool = false , bool = false , bool = false, bool = false , bool = false , bool = false , bool = false);
-//void ReadDDCifno(void);
-void run_systemconfig(QString,bool = false,QString = "");
-void writesettings();
-
-//void testXconfiguration();
-
-
-
-
-
-struct HostParms
-{
-        QString ThisHostName;
-        QString ThisHostDHCPhostname;
-
-        QString ThisHostIP;
-        QString ThisNETMASK;
-        QString ThisGW;
-        QString ThisDNS;
-        QString ThisDHCP;
-        QString ThisHostnetOLD;
-        QString ThisHostnetActiveOLD;
-
-        QString ThisHostDefaultInterface;
-        QString ThisHostIPeth0;
-        QString ThisHostNETMASKeth0;
-        QString ThisHostDNSeth0;
-        QString ThisHostUSEDHCPeth0;
-        QString ThisHostGWeth0;
-        QString ThisHOST_iswirelesseth0;
-        QString ThisHostActiveonbooteth0;
-        QString ThisHOSTESSIDeth0;
-        QString ThisHostUseEncryptioneth0;
-        QString ThisHostkeyeth0;
-        QString ThisHostMTUeth0;
-
-
-        QString ThisHostIPeth1;
-        QString ThisHostNETMASKeth1;
-        QString ThisHostDNSeth1;
-        QString ThisHostUSEDHCPeth1;
-        QString ThisHostGWeth1;
-        QString ThisHostActiveonbooteth1 ;
-        QString ThisHOST_iswirelesseth1;
-        QString ThisHOSTESSIDeth1;
-        QString ThisHostUseEncryptioneth1;
-        QString ThisHostkeyeth1;
-        QString ThisHostMTUeth1;
-
-        QString ThisHostIPwlan0;
-        QString ThisHostNETMASKwlan0;
-        QString ThisHostDNSwlan0;
-        QString ThisHostUSEDHCPwlan0;
-        QString ThisHostGWwlan0;
-        QString ThisHostActiveonbootwlan0;
-        QString ThisHOST_iswirelesswlan0;
-        QString ThisHOSTESSIDwlan0;
-        QString ThisHostUseEncryptionwlan0;
-        QString ThisHostkeywlan0;
-        QString ThisHostMTUwlan0;
-
-
-        QString ThisHostIPwlan1;
-        QString ThisHostNETMASKwlan1;
-        QString ThisHostDNSwlan1;
-        QString ThisHostUSEDHCPwlan1;
-        QString ThisHostGWwlan1;
-        QString ThisHostActiveonbootwlan1;
-        QString ThisHOST_iswirelesswlan1;
-        QString ThisHOSTESSIDwlan1;
-        QString ThisHostUseEncryptionwlan1;
-        QString ThisHostkeywlan1;
-        QString ThisHostMTUwlan1;
-
-        QString ThisHostIPath0;
-        QString ThisHostNETMASKath0;
-        QString ThisHostDNSath0;
-        QString ThisHostUSEDHCPath0;
-        QString ThisHostGWath0;
-        QString ThisHostActiveonbootath0;
-        QString ThisHOST_iswirelessath0;
-        QString ThisHOSTESSIDath0;
-        QString ThisHostUseEncryptionath0;
-        QString ThisHostkeyath0;
-        QString ThisHostMTUath0;
-
-
-        QString ThisRemote;
-        QString ThisTimeZone;
-        QString ThisSamba;
-        QString ThisHostServiceSamba_media;
-        QString ThisHostServiceSamba_home;
-        QString ThisHostServiceSamba_writehome;
-        QString ThisHostServiceSamba_write;
-        QString ThisHostServiceSamba_domain;
-        QString ThisNFS;
-        QString ThisMythWEB;
-        QString ThisHostwebauth;
-        QString ThisHostServiceHobbit;
-        QString ThisHostServiceRRD;
-
-        QString ThisHostRunDHCP;
-        QString ThisSystemType;
-//        QString ThisBlaster;
-
-        QString ThisHostTransmitproto_1;
-        QString ThisHostTransmitproto_2;
-        QString ThisHostTransmitproto_3;
-        QString ThisHostTransmitproto_4;
-        QString ThisHostBlasterType;
-        QString ThisHostSerialPort_blasterlirc;
-        QString ThisHostnumblaster;
-
-        QString ThisReceiverType;
-        QString ThisHostLircWait;
-        QString ThisHostSerialPortlirc;
-        QString ThisHostUseEvrouter;
-        QString ThisHostEvrouterConfig;
-        QString ThisDBhost;
-        QString ThisXres;
-        QString ThisShutdowntime;
-        QString ThisShutdowntime2;
-        QString ThisWakeuptime;
-        QString ThisAutodown;
-        QString ThisUseNVRAM;
-        QString ThisUseWOL;
-        QString ThisKeepPackage;
-        QString ThisMythWelcome;
-        QString ThisHaveNFS;
-        QString ThisNFSserver;
-        QString ThisNFSmountpoint;
-        QString ThisHostupdateplan;
-       // QString ThisOSS;
-        QString ThisShowToolTips;
-        QString ThisHostPKG_MIRROR;
-        QString ThisRunfrontend;
-        QString ThisHostZipcode;
-        QString ThisHostncidClient;
-        QString ThisHostncidDaemon;
-        QString ThisHostSerialPortncid;
-        QString ThisHostbootsplash;
-        QString ThisXIgnoreConfig;
-        QString ThisXcardtype;
-        QString ThisXUseAdvanced;
-        QString ThisXIgnoreEDID;
-        QString ThisXconnection;
-        QString ThisXHsync;
-        QString ThisXVrefresh;
-        QString ThisXresadvanced;
-        QString ThisXTVstandard;
-        QString ThisXTVconnection;
-        QString ThisXDisplaysize ;
-
-        QString ThisHostXNvidia1080p;
-        QString ThisHostXNvidia1080i;
-        QString ThisHostXNvidia720p;
-        QString ThisHostXNvidia480p;
-        QString ThisHostAudiotype;
-
-        QString ThisHostSoundTypeout;
-        QString ThisHostSoundOSSAnalog;
-        QString OLDHostSoundOSSAnalog;
-        QString ThisHostSoundOSSDigital;
-        QString OLDHostSoundOSSDigital;
-
-        QString ThisHostSoundDigital;
-        QString ThisHostSoundDevice;
-
-        QString ThisHostSoundALSAAnalog;
-        QString OLDHostSoundALSAAnalog;
-        QString ThisHostSoundALSADigital;
-        QString OLDHostSoundALSADigital;
-        QString ThisHostSoundALSATypeout;
-
-
-        QString ThisHostsyncXine;
-        QString ThisHostsyncMplayer;
-        QString ThisHostsyncMythMusic;
-        QString ThisHostsyncMythFrontend;
-        QString ThisHostLCDType;
-        QString ThisHostRemoteBackup;
-        QString ThisHostRemoteBackupDir;
-        QString ThisHostpluginmytharchive;
-        QString ThisHostpluginmythbrowser;
-        QString ThisHostpluginmythcontrols;
-        QString ThisHostpluginmythflix;
-        QString ThisHostpluginmythgallery;
-        QString ThisHostpluginmythgame;
-        QString ThisHostpluginmythmovietime;
-        QString ThisHostpluginmythmusic;
-        QString ThisHostpluginmythnews;
-        QString ThisHostpluginmythphone;
-        QString ThisHostpluginmythsmolt;
-        QString ThisHostpluginmythvideo;
-        QString ThisHostpluginmythweather;
-        QString ThisHostpluginmythzoneminder;
-        QString ThisHostpluginmythgameFceu;
-        QString ThisHostpluginmythgameZsnes;
-        QString ThisHostpluginmythgameMame;
-        QString ThisHostpluginmythvideo_dvdcss;
-        QString ThisHostpluginmythappletrailers;
-        QString ThisHostpluginmythstream;
-        QString ThisHostpluginmythvodka;
-        QString ThisHostMiro;
-        QString ThisHostpluginmythgameMednafen;
-        QString ThisHostpluginmythgameROMDB;
-        QString ThisHostXine;
-        QString ThisHostwebmin;
-        QString ThisHostfuppes;
-        QString ThisHostfoldingathome;
-        QString ThisHostfoldingusername;
-        QString ThisHostfoldingworksize;
-
-        QString ThisHostDDnslogin;
-        QString ThisHostDDnspassword;
-        QString ThisHostDDnshostname;
-        QString ThisHostDDnsEnable;
-        QString ThisHostscreensavertype;
-        QString ThisHostscreensaveridle;
-        QString ThisHostscreensavertheme;
-        QString ThisHOSTrootSSH;
-        bool displayshowadvancedX;
-
-
-};
-
-struct DDCinfo
-{
-        QString XVrefresh;
-        QString XHsync;
-        QString Displaysize;
-};
-
-
-
-
-
-
-
-#endif
diff --git a/abs/core-testing/mythinstall/main.cpp b/abs/core-testing/mythinstall/main.cpp
deleted file mode 100755
index afee4ea..0000000
--- a/abs/core-testing/mythinstall/main.cpp
+++ /dev/null
@@ -1,533 +0,0 @@
-#include <qapplication.h>
-#include <cstdlib>
-//#include "libmyth/mythdialogs.h"
-#include "libmyth/mythcontext.h"
-#include "libmyth/settings.h"
-#include "libmyth/langsettings.h"
-#include "libmyth/mythdbcon.h"
-#include <libmyth/exitcodes.h>
-#include "libmythtv/tv.h"
-#include "installdialog.h"
-#include "installsettings.h"
-#include "password_manage.h"
-#include "autocard.h"
-#include "settemplate.h"
-#include "mythdialogbox.h"
-//#include "mv_common.h"
-
-#include <iostream>
-#include <fstream>
-#include <stdio.h>
-
-#include "libmyth/dialogbox.h"
-#include <qlist.h>
-#include <qvaluevector.h>
-#include <qdir.h>
-HostParms hostparm;
-DDCinfo ddcinfo;
-
-
-void initKeys(void)
-{
-    REG_KEY("Welcome", "STARTXTERM", "Open an Xterm window", "F12");
-    REG_KEY("Welcome", "SHOWSETTINGS", "Show Mythshutdown settings", "F11");
-}
-
-
-int main(int argc, char **argv)
-{
-    bool bShowSettings = false;
-    bool bShowNetwork = false;
-    bool bShowHostype = false;
-    bool bShowMisc = false;
-    bool bShowshutdown = false;
-    bool bShowadvanced = false;
-    bool bShowsound = false;
-    bool bShowadvancedX = false;
-    bool bShowAccesscontrol = false;
-    bool bShowplugins = false;
-    bool bShowTemplate = false;
-    bool bShowuser  = false;
-    bool bShowwebuser = false;
-    bool bRunSetup = false;
-    bool bShowHelp = false;
-    bool bShowReadme = false;
-    bool bShowddns = false;
-    bool bShowinfrared = false;
-    bool bShowscreensaver = false;
-
-    QStringList template_c_line  ;
-    QString modulelist = "" ;
-    QString templateop="";
-    QString templatename="";
-    QString templatehostname="";
-    QApplication a(argc, argv);
-
-    gContext = NULL;
-    gContext = new MythContext(MYTH_BINARY_VERSION);
-    if (!gContext->Init())
-    {
-        VERBOSE(VB_IMPORTANT, "mythwelcome: Could not initialize myth context. "
-                        "Exiting.");
-        return FRONTEND_EXIT_NO_MYTHCONTEXT;
-    }
-
-    if (!MSqlQuery::testDBConnection())
-    {
-        VERBOSE(VB_IMPORTANT, "mythwelcome: Could not open the database. "
-                        "Exiting.");
-        return -1;
-    }
-
-    // Check command line arguments
-    for (int argpos = 1; argpos < a.argc(); ++argpos)
-    {
-
-        if (!strcmp(a.argv()[argpos],"-v") ||
-            !strcmp(a.argv()[argpos],"--verbose"))
-        {
-            if (a.argc()-1 > argpos)
-            {
-                if (parse_verbose_arg(a.argv()[argpos+1]) ==
-                        GENERIC_EXIT_INVALID_CMDLINE)
-                    return FRONTEND_EXIT_INVALID_CMDLINE;
-
-                ++argpos;
-            }
-            else
-            {
-                cerr << "Missing argument to -v/--verbose option\n";
-                return FRONTEND_EXIT_INVALID_CMDLINE;
-            }
-        }
-        else if (!strcmp(a.argv()[argpos],"-s") ||
-            !strcmp(a.argv()[argpos],"--setup"))
-        {
-            bShowSettings = true;
-//---------------------------------------------
-        if (a.argc()-1 > argpos)
-            {
-                QString tmpArg = a.argv()[argpos+1];
-                if (tmpArg.startsWith("-"))
-                {
-                    cerr << "Invalid or missing argument to -s \n";
-                    return FRONTEND_EXIT_INVALID_CMDLINE;
-                }
-
-                QStringList pairs = QStringList::split(",", tmpArg);
-                for (unsigned int index = 0; index < pairs.size(); ++index)
-                {
-                    if ( pairs[index]  == "network" )
-                        {
-                        //  cout << pairs[index] << endl;
-                            bShowNetwork = true;
-                            modulelist.append("network,");
-                        }
-                        else if ( pairs[index]  == "misc" )
-                        {
-                        //  cout << pairs[index] << endl;
-                            bShowMisc = true;
-                            modulelist.append("misc,");
-                        }
-                        else if ( pairs[index]  == "sleep" )
-                        {
-                        // cout << pairs[index] << endl;
-                            bShowshutdown = true;
-                            modulelist.append("sleep,");
-                        }
-                        else if ( pairs[index]  == "hostype" )
-                        {
-                        //  cout << pairs[index] << endl;
-                            bShowHostype = true;
-                            modulelist.append("hostype,");
-                        }
-                        else if ( pairs[index]  == "advanced" )
-                        {
-                        // cout << pairs[index] << endl;
-                            bShowadvanced = true;
-                            modulelist.append("advanced,");
-                        }
-                        else if ( pairs[index]  == "sound" )
-                        {
-                        // cout << pairs[index] << endl;
-                            bShowsound = true;
-                            modulelist.append("audio,");
-                        }
-                        else if ( pairs[index]  == "advancedX" )
-                        {
-                        // cout << pairs[index] << endl;
-                            bShowadvancedX = true;
-                            modulelist.append("advancedX,");
-                        }
-                        else if ( pairs[index]  == "accesscontrol" )
-                        {
-                        // cout << pairs[index] << endl;
-                            bShowAccesscontrol = true;
-                            modulelist.append("accesscontrol,");
-                        }
-                        else if ( pairs[index]  == "plugins" )
-                        {
-                        // cout << pairs[index] << endl;
-                            bShowplugins = true;
-                            modulelist.append("plugins,");
-                        }
-                        else if ( pairs[index]  == "user" )
-                        {
-                        // cout << pairs[index] << endl;
-                            bShowuser = true;
-                            modulelist.append("user,");
-                        }
-                        else if ( pairs[index]  == "webuser" )
-                        {
-                        // cout << pairs[index] << endl;
-                            bShowwebuser = true;
-                            modulelist.append("webuser,");
-                        }
-                        else if ( pairs[index]  == "ddns" )
-                        {
-                        // cout << pairs[index] << endl;
-                            bShowddns = true;
-                            modulelist.append("ddns,");
-                        }
-                        else if ( pairs[index]  == "ir" )
-                        {
-                        // cout << pairs[index] << endl;
-                            bShowinfrared = true;
-                            modulelist.append("ir,");
-                        }
-                        else if ( pairs[index]  == "screensaver" )
-                        {
-                        // cout << pairs[index] << endl;
-                            bShowscreensaver = true;
-                            modulelist.append("screensaver,");
-                        }
-
-                }
-            // return FRONTEND_EXIT_OK;
-            }
-            else
-            {
-            // if no args, then show the default steup.
-            bShowNetwork = true;
-            bShowHostype = true;
-            bShowMisc = true;
-            bShowuser = true;
-            bShowshutdown = true;
-
-            modulelist="network,hostype,misc,sleep";
-
-            }
-
-            ++argpos;
-
-
-//---------------------------------------------
-        }
-        else if (!strcmp(a.argv()[argpos],"-u"))
-            bShowuser = true;
-        else if (!strcmp(a.argv()[argpos],"-t"))
-        {
-            bShowTemplate = true;
-        if (a.argc()-1 > argpos)
-            {
-                QString tmpArg = a.argv()[argpos+1];
-                if (tmpArg.startsWith("-"))
-                {
-                    cerr << "Invalid or missing argument to -t \n";
-                    return FRONTEND_EXIT_INVALID_CMDLINE;
-                }
-                template_c_line = QStringList::split(",", tmpArg);
-                if ( template_c_line.size() != 0 )
-                    {
-                    if  ( template_c_line.size()  >3     ||  template_c_line.size() <2 )
-                        {
-                            cerr << "Invalid or missing argument to -t \n";
-                            return FRONTEND_EXIT_INVALID_CMDLINE;
-                        }
-                    }
-                ++argpos;
-        }
-
-        }
-        else if (!strcmp(a.argv()[argpos],"-b"))
-        {
-            bRunSetup = true;
-        }
-        else if (!strcmp(a.argv()[argpos],"-h"))
-        {
-            bShowHelp = true;
-        }
-        else if (!strcmp(a.argv()[argpos],"-r"))
-        {
-            bShowReadme = true;
-        }
-        else
-        {
-            cerr << "Invalid argument: " << a.argv()[argpos] << endl <<
-                    "Valid options are: " << endl <<
-                    "-v or --verbose debug-level    Use '-v help' for level info" << endl <<
-                    "-b  run backend setup" << endl <<
-                    "-h for help screens  " << endl <<
-                    "-t show template screens  (op,tname,hname)" << endl <<
-                    "-s or --setup (network,hostype,misc,sleep,advanced,advancedX,sound,accesscontrol,                  user,webuser,ddns,ir,screensaver)" << endl;
-            return FRONTEND_EXIT_INVALID_CMDLINE;
-        }
-    }
-
-    gContext->LoadQtConfig();
-
-    LanguageSettings::load("mythfrontend");
-
-    MythMainWindow *mainWindow = GetMythMainWindow();
-    // if parms were passed to -t then doen't init the screen.
-    if (   template_c_line.size()  == 0 )
-    {
-        gContext->SaveSetting("HOSTtemplatetype","Do Nothing" );
-        mainWindow->Init();
-        gContext->SetMainWindow(mainWindow);
-    };
-        initKeys();
-
-
-    if (bShowSettings)
-    {
-        bool runconfig = false;
-        system("cp -f /etc/systemconfig /tmp/systemconfig.bak");
-        QString olddb = gContext->GetSetting("HostMysqlserver");
-        QString oldhostype = gContext->GetSetting("HostSystemType");
-        runsettings(false,bShowNetwork,bShowHostype,bShowMisc,bShowshutdown,bShowadvanced,bShowsound,bShowadvancedX,bShowAccesscontrol,bShowplugins,bShowuser,bShowwebuser,bShowddns,bShowinfrared,bShowscreensaver);
-        QString newdb = gContext->GetSetting("HostMysqlserver");
-        QString newhostype = gContext->GetSetting("HostSystemType");
-        int status = system("diff /tmp/systemconfig.bak /etc/systemconfig");
-        bool restart = false;
-
-        // save my settings in case db switches
-        //cout << "save for the heck of it " << endl;
-        QString cmdtxt;
-        cmdtxt=MV_ROOT  ;
-        cmdtxt.append("bin/restore_default_settings.sh -c save -t syssettings  -d "  + olddb);
-        system(cmdtxt);
-        //system("/root/restore_default_settings.sh -c save -t syssettings  -d "  + olddb);
-
-        if ( status != 0 )
-        {
-                runconfig = true;
-        }
-
-        if ( newdb != olddb )
-            {
-            runconfig = true;
-            restart = true;
-            //db changed save setting from olddb
-            // cout << "newdb_olddb" << endl;
-            QString cmdtxt;
-                cmdtxt=MV_ROOT  ;
-                cmdtxt.append("bin/restore_default_settings.sh -c save  -t  syssettings  -d " + olddb ) ;
-                system(cmdtxt);
-            //system("/root/restore_default_settings.sh -c save  -t  syssettings  -d " + olddb ) ;
-            }
-
-        if ( runconfig )
-            {
-                if ( newhostype != oldhostype )
-                    modulelist.append("hostypec,");
-                //trim off last ,
-                modulelist.truncate(modulelist.length()-1);
-
-
-                cout << modulelist <<endl;
-                QString cmdtxt;
-                cmdtxt=MV_ROOT  ;
-                cmdtxt.append("bin/restore_default_settings.sh -c restore -t syssettings -d  ");
-                QString dbcommand = cmdtxt;
-                //QString dbcommand="/root/restore_default_settings.sh -c restore -t syssettings -d  ";
-                dbcommand.append(newdb);
-                //  cout << dbcommand << endl;
-                run_systemconfig(modulelist,restart,dbcommand);
-                //   cout << "running config" <<endl;
-            }
-        system("rm -f /tmp/systemconfig.bak");
-
-        if ( restart )
-           {
-                //restore settings to new database
-                //cout << " restoreing settings to new db" << endl;
-                //system("/root/restore_default_settings.sh save   syssettings  " + olddb ) ;
-            // system("/root/restore_default_settings.sh restore syssettings " + newdb) ;
-                    DialogBox *dia = NULL;
-                QString prompt;
-                QString *problems = new QString("The network address of the database has changed.");
-                problems->append("\n");
-                problems->append("The frontend will need to restart to connect to the new database.");
-                problems->append("\n");
-                dia = new DialogBox(mainWindow, problems->append("\n" ));
-                dia->AddButton(QObject::tr("OK"));
-                int returncode = 0;
-                returncode = dia->exec();
-                dia->deleteLater();
-                cout << "restarting" << endl;
-                //system("/root/systemconfig.sh  restartfe" );
-                QString cmdtxt;
-                cmdtxt=MV_ROOT  ;
-                cmdtxt.append("bin/systemconfig.sh  reloadfe" );
-                system(cmdtxt);
-            }
-
-    }
-    else if (bShowTemplate)
-    {
-    //  cout << templateparms << endl;
-        if ( template_c_line.size() == 2)
-        {
-                templateop=template_c_line[0];
-                templatename=template_c_line[1];
-        }
-        else if ( template_c_line.size() == 3)
-        {
-            templateop=template_c_line[0];
-            templatename=template_c_line[1];
-            templatehostname=template_c_line[2];
-        };
-        choosetemplate(templateop,templatename,templatehostname);
-    }
-
-    else if (bRunSetup)
-    {
-        DialogBox *dia = NULL;
-        QString prompt;
-        QString *problems = new QString("To configure the TV cards and program guide the setup program needs to be run.");
-        problems->append("\n");
-        problems->append("\n");
-
-        problems->append("For those in North America, guide data is provided by Schedules Direct.");
-        problems->append("\n");
-        problems->append("Visit  http://www.schedulesdirect.org/  to signup for your account today");
-        problems->append("\n");         problems->append("\n");          problems->append("\n");
-
-        problems->append("If you choose to not run mythtv-setup now, the program can be run at any time by typing mythtv-setup or hitting ALT+s");
-        problems->append("\n");
-
-        problems->append("\n");
-        prompt = QObject::tr("Do you wish to run mythtv-setup ?");
-
-            dia = new DialogBox(mainWindow, problems->append("\n" + prompt));
-            dia->AddButton(QObject::tr("Yes"));
-            dia->AddButton(QObject::tr("Yes and try to autodetect cards"));
-            dia->AddButton(QObject::tr("No"));
-            int returncode = 0;
-            //returncode = dia->exec();
-            DialogCode dcode = dia->exec();
-            dia->deleteLater();
-            if (kDialogCodeButton0 == dcode )
-                returncode = 0;
-            if (kDialogCodeButton1 == dcode )
-                returncode = 1;
-            if (kDialogCodeButton2 == dcode )
-                returncode = 2;
-
-            if (returncode == 1)
-            {
-                AutoCard listcards;
-                listcards.exec();
-                }
-
-            return returncode;
-
-
-    }
-else if (bShowHelp)
-    {
-        DialogBox *dia = NULL;
-        QString prompt;
-        QString *problems = new QString("			Help Screen");
-        problems->append("\n");
-        problems->append("-------------------------------------------------");
-        problems->append("\n");
-        problems->append("Alt+h This screen");
-        problems->append("\n");
-        #ifdef __MVAPP__
-            problems->append("F2 open/close  terminal");
-            problems->append("\n");
-            problems->append("Shift + Return  opens new xterm");
-            problems->append("\n");
-            problems->append("Alt+F2 for 2nd desktop  Alt+F1 to go back");
-            problems->append("\n");
-            problems->append("Alt+c Capture myth screenshot");
-            problems->append("\n");
-        #else
-            problems->append("Alt + X  opens new xterm ");
-            problems->append("\n");
-            problems->append("Alt + m  start mythfrontend");
-            problems->append("\n");
-            problems->append("m will display a popup for power/about");
-            problems->append("\n");
-        #endif
-        problems->append("Ctrl + Alt + u  unhide  mouse cursor");
-        problems->append("\n");
-        problems->append("Alt+1 start   masterbackend");
-        problems->append("\n");
-        problems->append("Alt+2 stop    masterbackend");
-        problems->append("\n");
-        problems->append("Alt+3 restart masterbackend");
-        problems->append("\n");
-        problems->append("Alt+s  run mythtv-setup");
-        problems->append("\n");
-
-
-            dia = new DialogBox(mainWindow, problems->append("\n" ));
-            dia->AddButton(QObject::tr("OK"));
-        // dia->AddButton(QObject::tr("No"));
-            int returncode = 0;
-            returncode = dia->exec();
-            dia->deleteLater();
-            return returncode;
-
-
-    }
-else if (bShowReadme)
-    {
-        DialogBox *dia = NULL;
-        QString prompt;
-        QString line;
-        QString *problems = new QString("");
-        problems->append("\n");
-        QFile file("/usr/MythVantage/README");
-        if ( file.open(IO_ReadOnly | IO_Translate) )
-        {
-        QTextStream t( &file );        // use a text stream
-            while ( !t.eof() )
-            {
-                line = t.readLine();
-                problems->append(line);
-                problems->append("\n");
-            }
-            file.close();
-        }
-        else
-            problems->append("Couldn't open file");
-
-        dia = new DialogBox(mainWindow, problems->append("\n" ));
-        dia->AddButton(QObject::tr("OK"));
-    // dia->AddButton(QObject::tr("No"));
-        int returncode = 0;
-        returncode = dia->exec();
-        dia->deleteLater();
-        return returncode;
-    }
-    else
-
-    {
-        WelcomeDialog *mythWelcome = new WelcomeDialog(gContext->GetMainWindow(),
-                                                    "welcome_screen", "install-",
-                                                "welcome_screen");
-
-        mythWelcome->exec();
-
-
-    delete mythWelcome;
-    }
-
-//  delete gContext;
-
-    return 0;
-}
diff --git a/abs/core-testing/mythinstall/misc_settings.cpp b/abs/core-testing/mythinstall/misc_settings.cpp
deleted file mode 100755
index 7c3eb67..0000000
--- a/abs/core-testing/mythinstall/misc_settings.cpp
+++ /dev/null
@@ -1,621 +0,0 @@
-#include <mythcontext.h>
-#include <unistd.h>
-#include <iostream>
-#include <fstream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <cstdlib>
-#include "misc_settings.h"
-#include "mv_common.h"
-#include "uitypes.h"
-
-extern  HostParms hostparm;
-
-static HostCheckBox *HostShowToolTips()
-{
-    HostCheckBox *gc = new HostCheckBox("HostShowToolTips");
-    gc->setLabel(QObject::tr("Show shortcuts"));
-    gc->setValue(true);
-    gc->setHelpText(QObject::tr("Shows a popup window describing how to open a console and various other items."));
-    return gc;
-};
-
-static HostComboBox *Hostupdateplan()
-{
-    HostComboBox *gc = new HostComboBox("Hostupdateplan");
-    gc->setLabel(QObject::tr("Automatic updates"));
-    gc->addSelection("None");
-    gc->addSelection("Myth_only");
-    gc->addSelection("All");
-    gc->setHelpText("Download and apply updates.  None: Will not download any updates , Myth_only: automatic updates for MythTV, All: Automatic updates for the entire system.");
-    return gc;
-
-}
-static HostLineEdit *HostZipcode()
-{
-    HostLineEdit *gc = new HostLineEdit("HostZipcode");
-    gc->setLabel(QObject::tr("Zip Code"));
-    gc->setHelpText(QObject::tr("The zipcode will be used to configure MythMovieTimes.  Leave it blank to use the existing value. People located outside the U.S.A should probably leave this blank"));
-    //gc->setRW();
-    //gc->setRO();
-    return gc;
-};
-
-//_______________Misc main frame
-MiscMainFrame::MiscMainFrame():
- VerticalConfigurationGroup(false,false,false,false)
-
-{
-     bool MVAPP;
-    #ifdef __MVAPP__
-        MVAPP = true ;
-    #else
-         MVAPP = false ;
-    #endif
-    bool showLabels;
-    hostparm.ThisSystemType = gContext->GetSetting("HostSystemType");
-    if  ( hostparm.ThisSystemType == "Standalone" || hostparm.ThisSystemType=="Master_backend")
-     {
-            showLabels = false;
-     }
-   else
-   {
-        showLabels = true;
-   }
-    TransLabelSetting *temptimezone = new TransLabelSetting();
-    temptimezone->setValue("Timezone:  " + hostparm.ThisTimeZone );
-    TransLabelSetting *tempzipcode = new TransLabelSetting();
-    tempzipcode->setValue("Zipcode: " + hostparm.ThisHostZipcode );
-    GridConfigurationGroup* miscsettings_2 =
-        new GridConfigurationGroup(1,true, true,false,false);
-
-     if (  showLabels  && ( hostparm.ThisHostZipcode != "" ))
-       if (MVAPP)
-           miscsettings_2->addChild(tempzipcode);
-       else
-           miscsettings_2->addChild(HostZipcode());
-    else
-       miscsettings_2->addChild(HostZipcode());
-
-    TimezoneRegion *timezoneregion = new TimezoneRegion();
-    TimezoneButton *timezonebutton = new TimezoneButton();
-
-    VerticalConfigurationGroup* miscsettings =
-        new VerticalConfigurationGroup(false, true,false,false);
-     if (  showLabels  && ( hostparm.ThisTimeZone != "" ))
-       {
-        if (MVAPP)
-            {
-                miscsettings->addChild(temptimezone);
-                timezonebutton->disableButton();
-            }
-        else
-            miscsettings->addChild(timezoneregion);
-        }
-    else
-        miscsettings->addChild(timezoneregion);
-
-    miscsettings->addChild(timezonebutton);
-    miscsettings->addChild(miscsettings_2);
-    addChild(miscsettings);
-
-    connect(timezonebutton, SIGNAL(mf_launch_tzgui()),timezoneregion ,SLOT(timezone_gathersettings()));
-    connect(timezoneregion,SIGNAL(mf_show_tz(QString)),this,SLOT(mf_show_tz(QString)));
-    connect(this,SIGNAL(update_timezone(QString)),timezoneregion,SLOT(update_timezone_values(QString)));
-
-    autoLaunchTimer = new QTimer(this);
-    connect(autoLaunchTimer, SIGNAL(timeout()), timezonebutton, SLOT(launch_tzgui()));
-    autoLaunchTimer->start(0);
- }
-
-QString MiscMainFrame::mf_show_tz(QString tz)
-{
-    QString GTimezone;
-    int rc;
-
-    if (autoLaunchTimer->isActive())
-    {
-      autoLaunchTimer->stop();
-
-      // This was triggered by the timer. Only launch the timezone gui if the timezone is unknown.
-      if (!timezone_unknown)
-	return NULL;
-    }
-
-    cout << "MiscMainFrame::mf_show_tz " << tz << "\n";
-
-    if ((tz == "") || timezone_unknown)
-      tz = "guess";
-
-   //launch tzgui and load output into Gtimezone
-    int screenheight = 0, screenwidth = 0;
-    float wmult = 0, hmult = 0;
-    QString m_height , m_width , cmd;
-    gContext->GetScreenSettings(screenwidth, wmult, screenheight, hmult);
-    m_height.setNum(screenheight);
-    m_width.setNum(screenwidth);
-    QString tzpath;
-    tzpath=MV_ROOT;
-    tzpath.append("bin/timezone.bin");
-    //cmd="ACCEL=500 " + tzpath + " -z " + tz + " -h " + m_height + " -w " + m_width + " > /tmp/.selected_tz" ;
-    cmd=tzpath + " -z " + tz + " -h " + m_height + " -w " + m_width + " > /tmp/.selected_tz" ;
-    rc=myth_system(cmd);
-    if ( rc == 0 )
-    {
-        //read in value
-        QString line;
-        QFile file("/tmp/.selected_tz");
-        if ( file.open(IO_ReadOnly | IO_Translate) )
-        {
-            QTextStream t( &file );        // use a text stream
-            while ( !t.eof() )
-            {
-                line = t.readLine();
-                if ( line.contains("/"))
-                    {
-                        GTimezone = line.simplifyWhiteSpace();
-                        break;
-                    }
-            }
-            file.close();
-        }
-	timezone_unknown = FALSE;
-        emit update_timezone(GTimezone);
-    }
-
-}
-
-
-//_______________Misc main frame
-MiscMainFrame2::MiscMainFrame2():
- VerticalConfigurationGroup(false,false,false,false)
- {
-    VerticalConfigurationGroup* miscsettings =
-        new VerticalConfigurationGroup(false, true,false,false);
-
-        GridConfigurationGroup* miscsettings_2 =
-         new GridConfigurationGroup(1,false, false,false,false);
-         miscsettings_2->addChild(HostShowToolTips());
-         miscsettings_2->addChild(Hostupdateplan());
-
-        NFSSettings *nfssettings = new NFSSettings();
-
-        miscsettings->addChild(nfssettings);
-        miscsettings->addChild(miscsettings_2);
-
-        addChild(miscsettings);
-
- }
-
-
-//_______________Misc time timezone
-
-TimezoneButton::TimezoneButton():
-    VerticalConfigurationGroup(false,false,false,false)
-    {
-      TZButton = new TransButtonSetting;
-      TZButton->setLabel("Hitchhikers guide to timezones");
-      addChild(TZButton);
-      connect(TZButton, SIGNAL(pressed()),this,SLOT(launch_tzgui()));
-
-    };
-
-void TimezoneButton::launch_tzgui()
-{
-    emit mf_launch_tzgui();
-}
-
-void TimezoneButton::disableButton()
-{
-    TZButton->setEnabled(false);
-}
-
-
-
-//This is used for the timezone
-QStringList findFilesRecursively ( QStringList paths, QString fileTypes ) {
-    if ( fileTypes.isEmpty() ) fileTypes = "*";
-    QStringList result, more;
-    QStringList::Iterator it;
-    for ( uint i = 0 ; i < paths.size() ; i++ )
-    { // inefficient...whatever
-        QDir dir( paths[i] );
-        dir.setSorting( QDir::Reversed );
-        more = dir.entryList( fileTypes, QDir::Files );
-        for ( it = more.begin() ; it != more.end() ; ++it )
-            result.append( paths[i] + "/" + *it );
-        // reg exp in next line excludes . and .. dirs (and .* actually)
-        more = dir.entryList( QDir::Dirs ).grep( QRegExp( "[^.]" ) );
-        for ( it = more.begin() ; it != more.end() ; ++it )
-            *it = paths[i] + "/" + *it;
-        more = findFilesRecursively( more, fileTypes );
-        for ( it = more.begin() ; it != more.end() ; ++it )
-            result.append( *it );
-    }
-    return result; // yields absolute paths
-}
-
-
-void TimezoneRegion::timezoneregion_fillselection_zone()
-{
-    HostTimeZoneRegion->setLabel(QObject::tr("TimeZone"));
-    HostTimeZoneRegion->addSelection("US");
-    HostTimeZoneRegion->addSelection("Pacific");
-    HostTimeZoneRegion->addSelection("Mideast");
-    HostTimeZoneRegion->addSelection("Mexico");
-    HostTimeZoneRegion->addSelection("Indian");
-    HostTimeZoneRegion->addSelection("Europe");
-    HostTimeZoneRegion->addSelection("Etc");
-    HostTimeZoneRegion->addSelection("Chile");
-    HostTimeZoneRegion->addSelection("Canada");
-    HostTimeZoneRegion->addSelection("Brazil");
-    HostTimeZoneRegion->addSelection("Australia");
-    HostTimeZoneRegion->addSelection("Atlantic");
-    HostTimeZoneRegion->addSelection("Asia");
-    HostTimeZoneRegion->addSelection("Arctic");
-    HostTimeZoneRegion->addSelection("Antarctica");
-    HostTimeZoneRegion->addSelection("America");
-    HostTimeZoneRegion->addSelection("Africa");
-    //--single region
-    HostTimeZoneRegion->addSelection("Zulu");
-    HostTimeZoneRegion->addSelection("WET");
-    HostTimeZoneRegion->addSelection("W-SU");
-    HostTimeZoneRegion->addSelection("Universal");
-    HostTimeZoneRegion->addSelection("UTC");
-    HostTimeZoneRegion->addSelection("UCT");
-    HostTimeZoneRegion->addSelection("Turkey");
-    HostTimeZoneRegion->addSelection("Singapore");
-    HostTimeZoneRegion->addSelection("ROK");
-    HostTimeZoneRegion->addSelection("ROC");
-    HostTimeZoneRegion->addSelection("Portugal");
-    HostTimeZoneRegion->addSelection("Poland");
-    HostTimeZoneRegion->addSelection("PST8PDT");
-    HostTimeZoneRegion->addSelection("PRC");
-    HostTimeZoneRegion->addSelection("Navajo");
-    HostTimeZoneRegion->addSelection("NZ-CHAT");
-    HostTimeZoneRegion->addSelection("NZ");
-    HostTimeZoneRegion->addSelection("MST7MDT");
-    HostTimeZoneRegion->addSelection("MST");
-    HostTimeZoneRegion->addSelection("MET");
-    HostTimeZoneRegion->addSelection("Libya");
-    HostTimeZoneRegion->addSelection("Kwajalein");
-    HostTimeZoneRegion->addSelection("Japan");
-    HostTimeZoneRegion->addSelection("Jamaica");
-    HostTimeZoneRegion->addSelection("Israel");
-    HostTimeZoneRegion->addSelection("Iran");
-    HostTimeZoneRegion->addSelection("Iceland");
-    HostTimeZoneRegion->addSelection("Hongkong");
-    HostTimeZoneRegion->addSelection("HST");
-    HostTimeZoneRegion->addSelection("Greenwich");
-    HostTimeZoneRegion->addSelection("GMT0");
-    HostTimeZoneRegion->addSelection("GMT-0");
-    HostTimeZoneRegion->addSelection("GMT+0");
-    HostTimeZoneRegion->addSelection("GMT");
-    HostTimeZoneRegion->addSelection("GB-Eire");
-    HostTimeZoneRegion->addSelection("GB");
-    HostTimeZoneRegion->addSelection("Factory");
-    HostTimeZoneRegion->addSelection("Eire");
-    HostTimeZoneRegion->addSelection("Egypt");
-    HostTimeZoneRegion->addSelection("EST5EDT");
-    HostTimeZoneRegion->addSelection("EST");
-    HostTimeZoneRegion->addSelection("EET");
-    HostTimeZoneRegion->addSelection("Cuba");
-    HostTimeZoneRegion->addSelection("CST6CDT");
-    HostTimeZoneRegion->addSelection("CET");
-    HostTimeZoneRegion->setHelpText(QObject::tr("Timezone Region"));
-}
-
-void TimezoneRegion::timezoneregion_fillselection(QString tzonefile )
-{
-    QString currentitem;
-    int foundtab;
-    int foundslashes;
-    QString timezonefile="/usr/share/zoneinfo/posix/";
-    timezonefile.append(tzonefile);
-    QStringList answer = findFilesRecursively( timezonefile, "*" );
-    QStringList onlyfiles = "";
-    QStringList::Iterator it;
-    for ( it = answer.begin(); it != answer.end(); ++it )
-        {
-            currentitem = *it;
-            foundtab=currentitem.contains(".tab");
-            if ( foundtab == 0 )
-            {
-                foundslashes=currentitem.contains("/");
-                currentitem = currentitem.section( '/', 6, foundslashes );
-
-                if ( tzonefile == "US")
-                    HostTimezoneRegion_US->addSelection(currentitem);
-                else if ( tzonefile == "Pacific")
-                    HostTimezoneRegion_Pacific->addSelection(currentitem);
-                else if ( tzonefile == "Mideast")
-                    HostTimezoneRegion_Mideast->addSelection(currentitem);
-                else if ( tzonefile == "Mexico")
-                    HostTimezoneRegion_Mexico->addSelection(currentitem);
-                else if ( tzonefile == "Indian")
-                    HostTimezoneRegion_Indian->addSelection(currentitem);
-                else if ( tzonefile == "Europe")
-                    HostTimezoneRegion_Europe->addSelection(currentitem);
-                else if ( tzonefile == "Etc")
-                    HostTimezoneRegion_Etc->addSelection(currentitem);
-                else if ( tzonefile == "Chile")
-                    HostTimezoneRegion_Chile->addSelection(currentitem);
-                else if ( tzonefile == "Canada")
-                    HostTimezoneRegion_Canada->addSelection(currentitem);
-                else if ( tzonefile == "Brazil")
-                    HostTimezoneRegion_Brazil->addSelection(currentitem);
-                else if ( tzonefile == "Australia")
-                    HostTimezoneRegion_Australia->addSelection(currentitem);
-                else if ( tzonefile == "Atlantic")
-                    HostTimezoneRegion_Atlantic->addSelection(currentitem);
-                else if ( tzonefile == "Asia")
-                    HostTimezoneRegion_Asia->addSelection(currentitem);
-                else if ( tzonefile == "Arctic")
-                    HostTimezoneRegion_Arctic->addSelection(currentitem);
-                else if ( tzonefile == "Antarctica")
-                    HostTimezoneRegion_Antarctica->addSelection(currentitem);
-                else if ( tzonefile == "America")
-                    HostTimezoneRegion_America->addSelection(currentitem);
-                else if ( tzonefile == "Africa")
-                    HostTimezoneRegion_Africa->addSelection(currentitem);
-            }
-        }
-};
-
-void TimezoneRegion::timezone_gathersettings()
-{
-    QString tz;
-    QString subregion;
-    QString region=HostTimeZoneRegion->getValue();
-    if ( region == "US")
-          subregion=HostTimezoneRegion_US->getValue();
-    else if ( region == "Pacific")
-          subregion=HostTimezoneRegion_Pacific->getValue();
-    else if ( region == "Mideast")
-          subregion=HostTimezoneRegion_Mideast->getValue();
-    else if ( region == "Mexico")
-          subregion=HostTimezoneRegion_Mexico->getValue();
-    else if ( region == "Indian")
-          subregion=HostTimezoneRegion_Indian->getValue();
-    else if ( region == "Europe")
-          subregion=HostTimezoneRegion_Europe->getValue();
-    else if ( region == "Etc")
-          subregion=HostTimezoneRegion_Etc->getValue();
-    else if ( region == "Chile")
-          subregion=HostTimezoneRegion_Chile->getValue();
-    else if ( region == "Canada")
-          subregion=HostTimezoneRegion_Canada->getValue();
-    else if ( region == "Brazil")
-          subregion=HostTimezoneRegion_Brazil->getValue();
-    else if ( region == "Australia")
-          subregion=HostTimezoneRegion_Australia->getValue();
-    else if ( region == "Atlantic")
-          subregion=HostTimezoneRegion_Atlantic->getValue();
-    else if ( region == "Asia")
-          subregion=HostTimezoneRegion_Asia->getValue();
-    else if ( region == "Arctic")
-          subregion=HostTimezoneRegion_Arctic->getValue();
-    else if ( region == "Antarctica")
-          subregion=HostTimezoneRegion_Antarctica->getValue();
-    else if ( region == "America")
-          subregion=HostTimezoneRegion_America->getValue();
-    else if ( region == "Africa")
-          subregion=HostTimezoneRegion_Africa->getValue();
-
-    tz=region+"/"+subregion;
-
-    emit mf_show_tz(tz);
-}
-
-TimezoneRegion::TimezoneRegion():
-    TriggeredConfigurationGroup(true,false,true,true,true,true,true,true)
-{
-    SetVertical(false);
-    HostTimeZoneRegion= new HostComboBox("HostTimeZoneRegion");
-    timezoneregion_fillselection_zone();
-    Setting* trigger = HostTimeZoneRegion;
-    addChild(trigger);
-    setTrigger(trigger);
-    //define all the new comboboxes
-    HostTimezoneRegion_US = new  HostComboBox("HostTimezoneRegion_US");
-    HostTimezoneRegion_Pacific = new HostComboBox("HostTimezoneRegion_Pacific");
-    HostTimezoneRegion_Mideast = new HostComboBox("HostTimezoneRegion_Mideast");
-    HostTimezoneRegion_Mexico = new  HostComboBox("HostTimezoneRegion_Mexico");
-    HostTimezoneRegion_Indian = new HostComboBox("HostTimezoneRegion_Indian");
-    HostTimezoneRegion_Europe = new HostComboBox("HostTimezoneRegion_Europe");
-    HostTimezoneRegion_Etc = new HostComboBox("HostTimezoneRegion_Etc");
-    HostTimezoneRegion_Chile = new HostComboBox("HostTimezoneRegion_Chile");
-    HostTimezoneRegion_Canada = new HostComboBox("HostTimezoneRegion_Canada");
-    HostTimezoneRegion_Brazil = new HostComboBox("HostTimezoneRegion_Brazil");
-    HostTimezoneRegion_Australia = new HostComboBox("HostTimezoneRegion_Australia");
-    HostTimezoneRegion_Atlantic = new HostComboBox("HostTimezoneRegion_Atlantic");
-    HostTimezoneRegion_Asia = new HostComboBox("HostTimezoneRegion_Asia");
-    HostTimezoneRegion_Arctic = new HostComboBox("HostTimezoneRegion_Arctic");
-    HostTimezoneRegion_Antarctica = new HostComboBox("HostTimezoneRegion_Antarctica");
-    HostTimezoneRegion_America = new HostComboBox("HostTimezoneRegion_America");
-    HostTimezoneRegion_Africa = new HostComboBox("HostTimezoneRegion_Africa");
-    //fill the new comboboxes
-    timezoneregion_fillselection("US");
-    timezoneregion_fillselection("Pacific");
-    timezoneregion_fillselection("Mideast");
-    timezoneregion_fillselection("Mexico");
-    timezoneregion_fillselection("Indian");
-    timezoneregion_fillselection("Europe");
-    timezoneregion_fillselection("Etc");
-    timezoneregion_fillselection("Chile");
-    timezoneregion_fillselection("Canada");
-    timezoneregion_fillselection("Brazil");
-    timezoneregion_fillselection("Australia");
-    timezoneregion_fillselection("Atlantic");
-    timezoneregion_fillselection("Asia");
-    timezoneregion_fillselection("Arctic");
-    timezoneregion_fillselection("Antarctica");
-    timezoneregion_fillselection("America");
-    timezoneregion_fillselection("Africa");
-
-    // Add subregions to regions
-    addTarget("US",  HostTimezoneRegion_US );
-    addTarget("Pacific",   HostTimezoneRegion_Pacific  );
-    addTarget("Mideast",    HostTimezoneRegion_Mideast  );
-    addTarget("Mexico", HostTimezoneRegion_Mexico  );
-    addTarget("Indian", HostTimezoneRegion_Indian   );
-    addTarget("Europe",  HostTimezoneRegion_Europe );
-    addTarget("Etc",  HostTimezoneRegion_Etc   );
-    addTarget("Chile",       HostTimezoneRegion_Chile );
-    addTarget("Canada",  HostTimezoneRegion_Canada );
-    addTarget("Brazil",  HostTimezoneRegion_Brazil  );
-    addTarget("Australia",  HostTimezoneRegion_Australia  );
-    addTarget("Atlantic",    HostTimezoneRegion_Atlantic  );
-    addTarget("Asia",   HostTimezoneRegion_Asia );
-    addTarget("Arctic",    HostTimezoneRegion_Arctic );
-    addTarget("Antarctica",     HostTimezoneRegion_Antarctica   );
-    addTarget("America", HostTimezoneRegion_America  );
-    addTarget("Africa",     HostTimezoneRegion_Africa );
-    //--single region
-    addTarget("Zulu", new VerticalConfigurationGroup(false, false));
-    addTarget("WET", new VerticalConfigurationGroup(false, false));
-    addTarget("W-SU", new VerticalConfigurationGroup(false, false));
-    addTarget("Universal", new VerticalConfigurationGroup(false, false));
-    addTarget("UTC", new VerticalConfigurationGroup(false, false));
-    addTarget("UCT", new VerticalConfigurationGroup(false, false));
-    addTarget("Turkey", new VerticalConfigurationGroup(false, false));
-    addTarget("Singapore", new VerticalConfigurationGroup(false, false));
-    addTarget("ROK", new VerticalConfigurationGroup(false, false));
-    addTarget("ROC", new VerticalConfigurationGroup(false, false));
-    addTarget("Portugal", new VerticalConfigurationGroup(false, false));
-    addTarget("Poland", new VerticalConfigurationGroup(false, false));
-    addTarget("PST8PDT", new VerticalConfigurationGroup(false, false));
-    addTarget("PRC", new VerticalConfigurationGroup(false, false));
-    addTarget("Navajo", new VerticalConfigurationGroup(false, false));
-    addTarget("NZ-CHAT", new VerticalConfigurationGroup(false, false));
-    addTarget("NZ", new VerticalConfigurationGroup(false, false));
-    addTarget("MST7MDT", new VerticalConfigurationGroup(false, false));
-    addTarget("MST", new VerticalConfigurationGroup(false, false));
-    addTarget("MET", new VerticalConfigurationGroup(false, false));
-    addTarget("Libya", new VerticalConfigurationGroup(false, false));
-    addTarget("Kwajalein", new VerticalConfigurationGroup(false, false));
-    addTarget("Japan", new VerticalConfigurationGroup(false, false));
-    addTarget("Jamaica", new VerticalConfigurationGroup(false, false));
-    addTarget("Israel", new VerticalConfigurationGroup(false, false));
-    addTarget("Iran", new VerticalConfigurationGroup(false, false));
-    addTarget("Iceland", new VerticalConfigurationGroup(false, false));
-    addTarget("Hongkong", new VerticalConfigurationGroup(false, false));
-    addTarget("HST", new VerticalConfigurationGroup(false, false));
-    addTarget("Greenwich", new VerticalConfigurationGroup(false, false));
-    addTarget("GMT0", new VerticalConfigurationGroup(false, false));
-    addTarget("GMT-0", new VerticalConfigurationGroup(false, false));
-    addTarget("GMT+0", new VerticalConfigurationGroup(false, false));
-    addTarget("GMT", new VerticalConfigurationGroup(false, false));
-    addTarget("GB-Eire", new VerticalConfigurationGroup(false, false));
-    addTarget("GB", new VerticalConfigurationGroup(false, false));
-    addTarget("Factory", new VerticalConfigurationGroup(false, false));
-    addTarget("Eire", new VerticalConfigurationGroup(false, false));
-    addTarget("Egypt", new VerticalConfigurationGroup(false, false));
-    addTarget("EST5EDT", new VerticalConfigurationGroup(false, false));
-    addTarget("EST", new VerticalConfigurationGroup(false, false));
-    addTarget("EET", new VerticalConfigurationGroup(false, false));
-    addTarget("Cuba", new VerticalConfigurationGroup(false, false));
-    addTarget("CST6CDT", new VerticalConfigurationGroup(false, false));
-    addTarget("CET", new VerticalConfigurationGroup(false, false));
-};
-
-void TimezoneRegion::update_timezone_values(QString Gtimezone)
-{
-    QString region;
-    QString subregion;
-    region=Gtimezone.section('/',0,0);
-    subregion=Gtimezone.section('/',1,1);
-    HostTimeZoneRegion->setValue(region);
-
-    if ( region == "US")
-        HostTimezoneRegion_US->setValue(subregion);
-    else if ( region == "Pacific")
-        HostTimezoneRegion_Pacific->setValue(subregion);
-    else if ( region == "Mideast")
-        HostTimezoneRegion_Mideast->setValue(subregion);
-    else if ( region == "Mexico")
-        HostTimezoneRegion_Mexico->setValue(subregion);
-    else if ( region == "Indian")
-        HostTimezoneRegion_Indian->setValue(subregion);
-    else if ( region == "Europe")
-        HostTimezoneRegion_Europe->setValue(subregion);
-    else if ( region == "Etc")
-        HostTimezoneRegion_Etc->setValue(subregion);
-    else if ( region == "Chile")
-        HostTimezoneRegion_Chile->setValue(subregion);
-    else if ( region == "Canada")
-        HostTimezoneRegion_Canada->setValue(subregion);
-    else if ( region == "Brazil")
-        HostTimezoneRegion_Brazil->setValue(subregion);
-    else if ( region == "Australia")
-        HostTimezoneRegion_Australia->setValue(subregion);
-    else if ( region == "Atlantic")
-        HostTimezoneRegion_Atlantic->setValue(subregion);
-    else if ( region == "Asia")
-        HostTimezoneRegion_Asia->setValue(subregion);
-    else if ( region == "Arctic")
-        HostTimezoneRegion_Arctic->setValue(subregion);
-    else if ( region == "Antarctica")
-        HostTimezoneRegion_Antarctica->setValue(subregion);
-    else if ( region == "America")
-        HostTimezoneRegion_America->setValue(subregion);
-    else if ( region == "Africa")
-        HostTimezoneRegion_Africa->setValue(subregion);
-}
-
-
-//________________Misc (NFS) Screen SETTINGS_________________________
-static HostComboBox *HostHaveCentralNFS()
-{
-    HostComboBox *gc = new HostComboBox("HostHaveCentralNFS");
-    gc->setLabel(QObject::tr("Central NFS server"));
-    gc->addSelection("no");
-    gc->addSelection("yes") ;
-    gc->setHelpText(QObject::tr("Select yes, if your media is stored on an NFS server different than the masterbackend.  Say no if you are confused."));
-
-    return gc;
-}
-
-static  HostComboBox *HostCentralNFSIP()
-{
-    HostComboBox *gc = new HostComboBox("HostCentralNFSIP",true);
-    gc->setLabel(QObject::tr("NFS server and sharename "));
-    gc->setHelpText(QObject::tr("Format should be  IP:/SHARENAME, for example  192.168.1.6:/media.  file:nfsmap  will load shares from the nfsmap file"));
-    gc->addSelection("file:nfsmap") ;
-    gc->addSelection("") ;
-    return gc;
-};
-
-static HostComboBox *HostNFSmountpoint()
-{
-    #ifdef __MVAPP__
-        HostComboBox *gc = new HostComboBox("HostNFSmountpoint");
-        gc->addSelection("/data/media");
-    #else
-        HostComboBox *gc = new HostComboBox("HostNFSmountpoint",true);
-        gc->addSelection("/myth");
-    #endif
-    gc->setLabel(QObject::tr("Local mount point of NFS share"));
-    gc->addSelection("/mnt") ;
-    gc->setHelpText(QObject::tr(""));
-    return gc;
-}
-
-
-NFSSettings::NFSSettings():
-    TriggeredConfigurationGroup(false,false,false,true,true,false,false,true)
-    {
-        setLabel(QObject::tr("Misc Settings"));
-
-        Setting* havenfs = HostHaveCentralNFS();
-        addChild(havenfs);
-        setTrigger(havenfs);
-
-    ConfigurationGroup* settings = new VerticalConfigurationGroup();
-            settings->addChild(HostCentralNFSIP());
-            settings->addChild(HostNFSmountpoint());
-
-        addTarget("no", new VerticalConfigurationGroup());
-        addTarget("yes", settings);
-    };
-
diff --git a/abs/core-testing/mythinstall/misc_settings.h b/abs/core-testing/mythinstall/misc_settings.h
deleted file mode 100755
index 66ad99c..0000000
--- a/abs/core-testing/mythinstall/misc_settings.h
+++ /dev/null
@@ -1,97 +0,0 @@
-#include <mythcontext.h>
-#include <unistd.h>
-#include <iostream>
-#include <fstream>
-#include <stdio.h>
-#include "settings.h"
-#include "installsettings.h"
-#include <qsqldatabase.h>
-#include <qsqlquery.h>
-
-#include <stdlib.h>
-#include <cstdlib>
-#include <mythtv/mythdbcon.h>
-#include <qdir.h>
-#include <qapplication.h>
-#include "util.h"
-
-
-class MiscMainFrame: public VerticalConfigurationGroup {
-Q_OBJECT
-public:
-        MiscMainFrame();
-QTimer *autoLaunchTimer;
-
-public slots:
-    QString mf_show_tz(QString);
-
-signals:
-    void update_timezone(QString);
-};
-
-class MiscMainFrame2: public VerticalConfigurationGroup {
-Q_OBJECT
-public:
-        MiscMainFrame2();
-};
-
-
-class TimezoneButton: public VerticalConfigurationGroup {
-Q_OBJECT
-public:
-        TimezoneButton();
-        TransButtonSetting   *TZButton;
-        void disableButton();
-public slots:
-    void launch_tzgui();
-signals:
-    QString mf_launch_tzgui();
-    //QString update_timezone(QString);
-};
-
-class TimezoneRegion: public TriggeredConfigurationGroup {
-Q_OBJECT
-public:
-    TimezoneRegion();
-    HostComboBox *HostTimeZoneRegion;
-    HostComboBox *HostTimezoneRegion_US;
-    HostComboBox *HostTimezoneRegion_Pacific;
-    HostComboBox *HostTimezoneRegion_Mideast;
-    HostComboBox *HostTimezoneRegion_Mexico;
-    HostComboBox *HostTimezoneRegion_Indian;
-    HostComboBox *HostTimezoneRegion_Europe;
-    HostComboBox *HostTimezoneRegion_Etc;
-    HostComboBox *HostTimezoneRegion_Chile;
-    HostComboBox *HostTimezoneRegion_Canada;
-    HostComboBox *HostTimezoneRegion_Brazil;
-    HostComboBox *HostTimezoneRegion_Australia;
-    HostComboBox *HostTimezoneRegion_Atlantic;
-    HostComboBox *HostTimezoneRegion_Asia;
-    HostComboBox *HostTimezoneRegion_Arctic;
-    HostComboBox *HostTimezoneRegion_Antarctica;
-    HostComboBox *HostTimezoneRegion_America;
-    HostComboBox *HostTimezoneRegion_Africa;
-    void timezoneregion_fillselection(QString);
-    void timezoneregion_fillselection_zone();
-
-
-public slots:
-    void update_timezone_values(QString);
-    void timezone_gathersettings();
-signals:
-    void mf_show_tz(QString);
-};
-
-
-class NFSSettings: public
-    TriggeredConfigurationGroup {
-    public:
-        NFSSettings();
-
-};
-
-
-
-
-
-
diff --git a/abs/core-testing/mythinstall/mv_common.h b/abs/core-testing/mythinstall/mv_common.h
deleted file mode 100755
index 865eb3d..0000000
--- a/abs/core-testing/mythinstall/mv_common.h
+++ /dev/null
@@ -1,4 +0,0 @@
-//#define __MVAPP__ MythVantage
-#define RELEASEFILE "LinHES-release"
-
-extern int timezone_unknown;
diff --git a/abs/core-testing/mythinstall/mythinstall.pro b/abs/core-testing/mythinstall/mythinstall.pro
deleted file mode 100755
index 0a273cc..0000000
--- a/abs/core-testing/mythinstall/mythinstall.pro
+++ /dev/null
@@ -1,46 +0,0 @@
-# This is the path to the mythtv src. The assumtion is that this package and 
-# mythtv are both being build in the LinHES-PKGBUILD.
-MYTHPATH="/data/LinHES-PKGBUILD/abs/core-testing/mythtv/stable/mythtv/src/mythtv-0.21"
-
-include ( $$MYTHPATH/libs/libmyth/mythconfig.mak)
-include ( $$MYTHPATH/settings.pro)
-
-#pulled from program-libs.pro and modified to use $$MYTHPATH
-INCLUDEPATH += $$MYTHPATH $$MYTHPATH/libs/ $$MYTHPATH/libs/libmyth $$MYTHPATH/libs/libmythtv
-INCLUDEPATH += $$MYTHPATH/libs/libavutil $$MYTHPATH/libs/libavformat $$MYTHPATH/libs/libavcodec
-INCLUDEPATH += $$MYTHPATH/libs/libmythupnp $$MYTHPATH/libs/libmythui
-INCLUDEPATH += $$MYTHPATH/libs/libmythlivemedia
-
-LIBS += -L$$MYTHPATH/libs/libmyth -L$$MYTHPATH/libs/libmythtv
-LIBS += -L$$MYTHPATH/libs/libavutil -L$$MYTHPATH/libs/libavcodec -L$$MYTHPATH/libs/libavformat
-LIBS += -L$$MYTHPATH/libs/libmythfreemheg
-LIBS += -L$$MYTHPATH/libs/libmythui
-LIBS += -L$$MYTHPATH/libs/libmythupnp
-LIBS += -L$$MYTHPATH/libs/libmythlivemedia
-
-LIBS += -lmythtv-$$LIBVERSION -lmythavformat-$$LIBVERSION
-LIBS += -lmythavutil-$$LIBVERSION -lmythavcodec-$$LIBVERSION
-LIBS += -lmythfreemheg-$$LIBVERSION
-LIBS += -lmythupnp-$$LIBVERSION
-LIBS += -lmythlivemedia-$$LIBVERSION
-
-
-
-TEMPLATE = app
-CONFIG += thread
-TARGET = mythinstall
-target.path = $${PREFIX}/bin
-
-INSTALLS = target
-
-uifiles.path = $${PREFIX}/share/mythtv/themes/default
-uifiles.files = install-ui.xml images/*.png
-
-INSTALLS += uifiles
-
-QMAKE_CLEAN += $(TARGET)
-
-# Input
-HEADERS += installdialog.h installsettings.h settemplate.h installationtype.h autocard.h xorgsettings.h password_manage.h misc_settings.h mv_common.h infrared.h
-SOURCES += main.cpp installdialog.cpp installsettings.cpp settemplate.cpp installationtype.cpp autocard.cpp xorgsettings.cpp password_manage.cpp misc_settings.cpp infrared.cpp
-INCLUDEPATH += /usr/include/mythtv
diff --git a/abs/core-testing/mythinstall/password_manage.cpp b/abs/core-testing/mythinstall/password_manage.cpp
deleted file mode 100755
index 5156636..0000000
--- a/abs/core-testing/mythinstall/password_manage.cpp
+++ /dev/null
@@ -1,445 +0,0 @@
-#include <mythcontext.h>
-#include <unistd.h>
-#include <iostream>
-#include <fstream>
-#include <stdio.h>
-#include "settings.h"
-#include "installsettings.h"
-#include "installdialog.h"
-#include "password_manage.h"
-#include <qsqldatabase.h>
-#include <qsqlquery.h>
-
-#include <stdlib.h>
-#include <cstdlib>
-#include <mythtv/mythdbcon.h>
-#include <qdir.h>
-#include <qapplication.h>
-#include "util.h"
-#include <qregexp.h>
-/****************************************************************************/
-typedef enum {
-    UseraddPopup_OK = 0,
-    UseraddPopup_CANCEL,
-    UseraddPopup_DELETE
-}
-    UseraddPopupResult;
-    bool passtoggle = TRUE;
-    QString invalid_chars = "&<>/~`;:!";
-
-class AddUserPopup
-{
-  public:
-    static UseraddPopupResult showPopup(MythMainWindow *parent, QString title,
-                                   QString message, QString& text);
-};
-
-UseraddPopupResult AddUserPopup::showPopup(MythMainWindow *parent,
-                                 QString title, QString message, QString& text)
-{
-    MythPopupBox *popup = new MythPopupBox(parent, title);
-    popup->addLabel(message);
-
-    MythLineEdit *textEdit = new MythLineEdit(popup, "chooseEdit");
-    textEdit->setText(text);
-    popup->addWidget(textEdit);
-
-    popup->addButton(QObject::tr("OK"),     popup, SLOT(accept()));
-    popup->addButton(QObject::tr("Cancel"), popup, SLOT(reject()));
-
-    textEdit->setFocus();
-
-    bool ok = (MythDialog::Accepted == popup->ExecPopup());
-    if (ok)
-        text = QDeepCopy<QString>(textEdit->text());
-
-    popup->hide();
-    popup->deleteLater();
-
-    return (ok) ? UseraddPopup_OK : UseraddPopup_CANCEL;
-}
-
-/****************************************************************************/
-
-
-void UserManagement::user_fillselection()
-{
-   //only add users with UID above 1000
-   QString line;
-   QString user;
-   QString quid;
-   int uid;
-   QFile file("/etc/passwd");
-    if ( file.open(IO_ReadOnly | IO_Translate) )
-    {
-        QTextStream t( &file );        // use a text stream
-        while ( !t.eof() )
-        {
-            line = t.readLine();
-            user = line.section(":",0,0);
-            quid = line.section(":",2,2);
-            uid=quid.toInt();
-            if ( uid >= 1000 )
-                userlist->addSelection(user);
-        }
-        file.close();
-    }
-
-}
-
-bool UserManagement::user_exisit_check(QString name)
-{
-   QString line;
-   QString user;
-   QString quid;
-   bool founduser;
-   founduser=false;
-   int uid;
-   QFile file("/etc/passwd");
-    if ( file.open(IO_ReadOnly | IO_Translate) )
-    {
-        QTextStream t( &file );        // use a text stream
-        while ( !t.eof() )
-        {
-            line = t.readLine();
-            user = line.section(":",0,0);
-            quid = line.section(":",2,2);
-            uid=quid.toInt();
-            if ( user == name )
-            {
-                founduser=true;
-                break;
-            }
-        }
-        file.close();
-    }
-
-    return founduser;
-
-}
-
-bool UserManagement::user_valid_check(QString check_string)
-{
-    QChar current_char;
-    int upperlimit;
-    int found_char;
-    int i ;
-    upperlimit = invalid_chars.length() -1 ;
-    for(i= 0; i <= upperlimit; i++)
-    {
-        found_char = -1;
-        current_char = invalid_chars.at(i);
-        found_char = check_string.contains(current_char,FALSE);
-        if ( found_char  > 0  )
-            return FALSE;
-    }
-    return TRUE ;
-
-}
-
-UserManagement::UserManagement():
-    VerticalConfigurationGroup(false,false,false,false)
-    {
-      setLabel(QObject::tr("Password Management"));
-      userlist = new TransComboBoxSetting(false);
-      userlist->setLabel(QObject::tr("Current Accounts"));
-      userlist->addSelection("root");
-      userlist->addSelection("mythtv");
-      user_fillselection();
-      userlist->setHelpText(QObject::tr("Select the account for password reset"));
-
-      userpass1= new TransLineEditSetting(true);
-      userpass1->setLabel("Password");
-      userpass1->SetPasswordEcho(passtoggle);
-      userpass1->setHelpText(QObject::tr("The following characters will not be accepted: " + invalid_chars));
-
-
-      passToggleButton = new TransButtonSetting;
-      passToggleButton->setLabel("Toggle password view");
-      passToggleButton->setHelpText(QObject::tr("Hide or show the password"));
-
-      info = new TransLabelSetting;
-      info->setValue("");
-
-       userapplyButton = new TransButtonSetting;
-       userapplyButton->setLabel("Apply new password");
-
-       usercreateButton = new TransButtonSetting;
-       usercreateButton->setLabel("Create a new user account");
-       usercreateButton->setHelpText(QObject::tr("The following characters will not be accepted: " + invalid_chars));
-
-       userdeleteButton = new TransButtonSetting;
-       userdeleteButton->setLabel("Delete current account");
-       ConfigurationGroup *buttonlist = new GridConfigurationGroup(2,false);
-            buttonlist-> addChild(usercreateButton);
-            buttonlist-> addChild(userdeleteButton);
-
-       ConfigurationGroup *buttonlist2 = new GridConfigurationGroup(2,false);
-            buttonlist2-> addChild(passToggleButton);
-            buttonlist2-> addChild(userapplyButton);
-
-    rootSSH  = new HostCheckBox("HOSTrootSSH");
-    rootSSH->setLabel("Enable remote access for the root account.");
-    rootSSH->setHelpText(QObject::tr("Checking this will enable ssh for the root account. Leave this disabled unless you know what your doing."));
-    rootSSH->setValue(false);
-
-       addChild(userlist);
-       addChild(buttonlist);
-       addChild(userpass1);
-       addChild(info);
-       addChild(rootSSH);
-       addChild(buttonlist2);
-
-    connect(userapplyButton, SIGNAL(pressed()), this,   SLOT(applychanges()));
-    connect(userlist, SIGNAL(valueChanged(const QString&)), this,   SLOT(userchanged()));
-    connect(usercreateButton, SIGNAL(pressed()), this,   SLOT(usercreatepopup()));
-    connect(userdeleteButton, SIGNAL(pressed()), this, SLOT(userdeletepopup()));
-    connect(passToggleButton, SIGNAL(pressed()), this, SLOT(togglepass()));
-};
-
-void UserManagement::togglepass()
-{
-
-    if ( passtoggle)
-        passtoggle = false;
-    else
-        passtoggle = true;
-    userpass1->SetPasswordEcho(passtoggle);
-}
-
-void UserManagement::applychanges()
-{
-    QString user;
-    QString password;
-    QString user_e;
-
-    user=userlist->getValue();
-    password=[REDACTED]
-
-    user_e = QRegExp::escape( user );
-    password = [REDACTED] password );
-    if ( ! user_valid_check (password))
-    {
-         info->setValue("    Password contains invalid characters!");
-         return;
-    }
-    info->setValue("    Password has been changed for user: " + user );
-    QString cmdtxt;
-    cmdtxt="sudo ";
-    cmdtxt.append("myth_user_call -c pass  -u " + user_e + " -p " + password );
-    myth_system(cmdtxt);
-
-
-}
-
-void UserManagement::userchanged()
-{
-    info->setValue(" ");
-    userpass1->setValue("");
-}
-
-void UserManagement::usercreatepopup()
-{
-    QString name;
-    QString name_e;
-    int key = 0;
-     UseraddPopupResult result = AddUserPopup::showPopup(
-                gContext->GetMainWindow(),
-                tr(""),
-                tr("Enter a new user account name"), name);
-    if (result == UseraddPopup_CANCEL)
-        return;
-    //check if name exisit || add it
-    if ( user_exisit_check(name) )
-    {
-        info->setValue(name + " Already present");
-        userlist->setFocus();
-        key = Qt::Key_Down;
-        QApplication::postEvent(gContext->GetMainWindow(),
-                            new ExternalKeycodeEvent(key));
-
-        return;
-    }
-
-    if ( ! user_valid_check (name))
-    {
-         info->setValue("  Username contains invalid characters!");
-         return;
-    }
-    userlist->addSelection(name);
-    userlist->setValue(name);
-    //run program to add user right here
-    QString cmdtxt;
-    name_e = QRegExp::escape( name );
-
-    cmdtxt="sudo ";
-    cmdtxt.append("myth_user_call -c add -u " + name_e );
-    myth_system(cmdtxt);
-
-    info->setValue("Now enter a password for " + name + " and press the apply button.");
-    //Set focus to userlist, then press down three times to set focus to the password box.
-    userlist->setFocus();
-
-    key = Qt::Key_Down;
-    QApplication::postEvent(gContext->GetMainWindow(),
-                            new ExternalKeycodeEvent(key));
-    key = Qt::Key_Down;
-    QApplication::postEvent(gContext->GetMainWindow(),
-                                new ExternalKeycodeEvent(key));
-    key = Qt::Key_Down;
-    QApplication::postEvent(gContext->GetMainWindow(),
-                             new ExternalKeycodeEvent(key));
-
-}
-
-void UserManagement::userdeletepopup()
-{
-    QString user;
-    QString user_e;
-    user=userlist->getValue();
-    QString message = user ;
-
-    DialogCode value = MythPopupBox::Show2ButtonPopup(
-        gContext->GetMainWindow(), "", message,
-        tr("Remove this account"),
-        tr("Do not remove this account"),
-        kDialogCodeButton1);
-
-   if (kDialogCodeButton0 == value)
-   {
-         info->setValue("removed account: " + user);
-         if ( user == "root" || user == "mythtv" )
-         {
-            info->setValue("Can not remove the account");
-            return;
-         }
-         userlist->setValue("root");
-         userlist->removeSelection(user);
-         //run program to remove user
-        QString cmdtxt;
-        user_e = QRegExp::escape( user );
-        cmdtxt="sudo ";
-        cmdtxt.append("myth_user_call -c delete -u " + user_e );
-        myth_system(cmdtxt);
-        info->setValue("Removed account: " + user);
-   }
-    else
-        info->setValue("Did not remove account: " + user);
-}
-
-WebPassword::WebPassword():
-    TriggeredConfigurationGroup(true,false,true,true,true,true,true,true)
-{
-
-    webAuth  = new HostCheckBox("HOSTwebauth");
-    webAuth->setLabel("Enable password");
-    webAuth->setHelpText(QObject::tr("Enable the use of password protection for the local website."));
-    webAuth->setValue(false);
-    webuser = new HostLineEdit("Hostwebuser");
-    webuser->setLabel("Username");
-    webuser->setHelpText(QObject::tr("The following characters will not be accepted: " + invalid_chars));
-
-    webpassword = new HostLineEdit("Hostwebpassword");
-    webpassword->setLabel("Password");
-    webpassword->SetPasswordEcho(passtoggle);
-    webpassword->setHelpText(QObject::tr("The following characters will not be accepted: " + invalid_chars));
-
-    webpassToggleButton = new TransButtonSetting;
-    webpassToggleButton->setLabel("Toggle password view");
-    webpassToggleButton->setHelpText(QObject::tr("Hide or show the password"));
-
-    webapplyButton = new TransButtonSetting;
-    webapplyButton->setLabel("Apply new password");
-
-    info = new TransLabelSetting;
-    info->setValue("");
-
-    connect(webpassToggleButton, SIGNAL(pressed()), this, SLOT(togglepass()));
-    connect(webapplyButton, SIGNAL(pressed()),this , SLOT(webpassword_gathersettings()));
-
-    ConfigurationGroup* webpassgroup = new VerticalConfigurationGroup(false);
-        webpassgroup->addChild(webuser);
-        webpassgroup->addChild(webpassword);
-        webpassgroup->addChild(info);
-        webpassgroup->addChild(webpassToggleButton);
-            webpassgroup->addChild(webapplyButton);
-
-    addChild(webAuth);
-    setTrigger(webAuth);
-
-    addTarget("0", new VerticalConfigurationGroup(false, false));
-    addTarget("1", webpassgroup);
-
-}
-
-
-void WebPassword::togglepass()
-{
-    if ( passtoggle)
-        passtoggle = false;
-    else
-        passtoggle = true;
-    webpassword->SetPasswordEcho(passtoggle);
-}
-
-bool WebPassword::valid_check(QString check_string)
-{
-   // QString invalid_chars;
-    QChar current_char;
-    int upperlimit;
-    int found_char;
-    int i ;
-    //invalid_chars = "&<>/~`;";
-    upperlimit = invalid_chars.length() -1 ;
-    for(i= 0; i <= upperlimit; i++)
-    {
-        found_char = -1;
-        current_char = invalid_chars.at(i);
-        found_char = check_string.contains(current_char,FALSE);
-        if ( found_char  > 0  )
-            return FALSE;
-    }
-    return TRUE ;
-
-}
-
-void WebPassword::webpassword_gathersettings()
-{
-
-    QString pass_enabled;
-    QString web_user;
-    QString web_pass;
-    QString webuser_e;
-    QString webpass_e;
-    pass_enabled=webAuth->getValue();
-    web_user=webuser->getValue();
-    web_pass=webpassword->getValue();
-    webuser_e = QRegExp::escape( web_user );
-    webpass_e = QRegExp::escape( web_pass );
-    if ( ! valid_check (webuser_e))
-    {
-         info->setValue("    Username contains invalid characters!");
-         return;
-    }
-
-    if ( ! valid_check (webpass_e))
-    {
-         info->setValue("    Password contains invalid characters!");
-         return;
-    }
-    cout << "Running program to make the changes for web password" << endl;
-    QString cmdtxt;
-
-    cmdtxt="sudo ";
-    cmdtxt.append("myth_user_call -c web -u " + webuser_e + " -p " + webpass_e );
-    myth_system(cmdtxt);
-    info->setValue("   Changes applied");
-
-}
-
-WebPasswordFrame::WebPasswordFrame():
-    VerticalConfigurationGroup()
-{
-    WebPassword *webpassword = new WebPassword();
-    addChild(webpassword);
-}
diff --git a/abs/core-testing/mythinstall/password_manage.h b/abs/core-testing/mythinstall/password_manage.h
deleted file mode 100755
index 665f23f..0000000
--- a/abs/core-testing/mythinstall/password_manage.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#include <settings.h>
-#include "mythdialogs.h"
-#include "libmyth/mythdialogs.h"
-#include "libmyth/mythwidgets.h"
-#include "installsettings.h"
-
-
-class UserManagement: public VerticalConfigurationGroup {
-  Q_OBJECT
-public:
-    UserManagement();
-    TransComboBoxSetting *userlist;
-    TransLineEditSetting *userpass1;
-    TransButtonSetting   *userapplyButton;
-    TransButtonSetting   *usercreateButton;
-    TransButtonSetting   *userdeleteButton;
-    TransButtonSetting   *passToggleButton;
-    TransLabelSetting    *info;
-    TransCheckBoxSetting *lockaccount;
-    HostCheckBox    *rootSSH;
-    void user_fillselection(void);
-    bool user_exisit_check(QString);
-    bool user_valid_check(QString);
-
-public slots:
-    void applychanges();
-    void userchanged();
-    void usercreatepopup();
-    void userdeletepopup();
-    void togglepass();
-};
-
-
-
-class WebPassword: [REDACTED]
-    TriggeredConfigurationGroup {
-    Q_OBJECT
-public:
-    WebPassword();
-    HostLineEdit    *webuser;
-    HostLineEdit    *webpassword;
-    HostCheckBox    *webAuth;
-    TransButtonSetting   *webpassToggleButton;
-    TransLabelSetting    *info;
-    bool valid_check(QString);
-    TransButtonSetting   *webapplyButton;
-
-public slots:
-    void webpassword_gathersettings();
-    void togglepass();
-};
-
-class WebPasswordFrame: public
-    VerticalConfigurationGroup {
-    Q_OBJECT
-public:
-    WebPasswordFrame();
-    TransButtonSetting   *webapplyButton;
-
-};
diff --git a/abs/core-testing/mythinstall/settemplate.cpp b/abs/core-testing/mythinstall/settemplate.cpp
deleted file mode 100755
index c12ef06..0000000
--- a/abs/core-testing/mythinstall/settemplate.cpp
+++ /dev/null
@@ -1,419 +0,0 @@
-#include <mythcontext.h>
-#include <unistd.h>
-#include <iostream>
-#include <fstream>
-#include <stdio.h>
-#include "settings.h"
-#include "installsettings.h"
-#include "installdialog.h"
-#include "settemplate.h"
-#include <qsqldatabase.h>
-#include <qsqlquery.h>
-#include <stdlib.h>
-#include <cstdlib>
-
-#include <mythtv/mythdbcon.h>
-
-void create_temp_table (QString create_table_name,QString like_name)
-{
-   MSqlQuery query(MSqlQuery::InitCon());
-   query.prepare("create table " +  create_table_name + " like  " +   like_name + ";" );
-    query.exec();
-    if ( like_name == "settings")
-    {
-        query.prepare("Alter table  " + create_table_name +  " add unique ( value ) ; " );
-        query.exec();
-    }
-    query.prepare(" truncate " + create_table_name + ";" );
-    query.exec();
-};
-
-void drop_temp_table (QString tname)
-{
-    MSqlQuery query(MSqlQuery::InitCon());
-    query.prepare("drop table " +  tname + ";" );
-    query.exec();
-}
-
-void restart_frontend ()
-{
-
-    QString cmdtxt;
-    cmdtxt=MV_ROOT  ;
-    cmdtxt.append("bin/systemconfig.sh  reloadfe" );
-    cout << "Calling systemconfig.sh reloadfe" << endl;
-    system(cmdtxt);
-    //system("/root/systemconfig.sh  reloadfe" );
-}
-
-void choosetemplate (QString templateop, QString templatename  , QString templatehostname = "")
-{
-        if ( templateop == ""  )
-        {
-        MythCtemplate setting;
-        setting.load();
-        setting.save();
-      	setting.exec();
-         };
-
-    	QString thistemplate;
-    	QString thisoperation;
-        QString thishost;
-        //QString runcommand = "/root/restore_default_settings.sh";
-        QString runcommand = "echo ";
-       // cout <<  templateop << endl;
-       // cout << templatename << endl;
-       // cout << templatehostname << endl;
-
-        if (templateop == "")
-            	   thisoperation = gContext -> GetSetting("HOSTtemplatetype");
-        else
-                   thisoperation = templateop;
-
-        thistemplate = "none";
-
-
-  	if ( thisoperation == "save" )
-	{
-        if (templatename == "" )
-    	    thistemplate = gContext -> GetSetting("HostTemplateSave");
-        else
-            thistemplate = templatename;
-
-        savesettings(thistemplate);
-	}
-	else if ( thisoperation == "restore" )
-	{
-       if (templatename == "" )
-    	    thistemplate = gContext -> GetSetting("HostTemplateRestore");
-        else
-            thistemplate = templatename;
-
-        if ( thistemplate == "default_1")
-             c_from("default_1" , thistemplate);
-        else if ( thistemplate == "default_2")
-             c_from("default_2" ,thistemplate);
-        else
-             restoresettings(thistemplate);
-
-	}
-    else if ( thisoperation == "copy_from" )
-	{
-        if (templatename == "" )
-        {
-            thishost = gContext ->GetSetting("HostSelectcopy_from");
-            thistemplate = gContext ->GetSetting("HostTemplateRestore");
-        }
-        else
-        {
-            thishost=templatehostname;
-            thistemplate=templatename;
-        };
-
-        c_from(thishost,thistemplate);
-	}
-
-
-//	if ( thistemplate != "none" )
-//	{
-// 	    std::cout <<  runcommand << endl;
-   	 //   system(runcommand);
-	//}
-};
-
-
-void savesettings (QString templatenumber )
-{
-    cout << "SAVING....." <<   templatenumber  << endl;
-    QString templatename = "settings_" + templatenumber ;
-    // Remove old saved values
-    MSqlQuery query(MSqlQuery::InitCon());
-     query.prepare( "delete from "  + templatename +  " where hostname=:HOSTNAME   ;"  );
-    query.bindValue( ":HOSTNAME" ,   gContext->GetHostName()  );
-    query.exec();
-    //insert all new settings
-    query.prepare( "replace into "  + templatename +  " (select * from settings where hostname=:HOSTNAME  ) ;"  ) ;
-    query.bindValue( ":HOSTNAME" ,   gContext->GetHostName()  );
-    query.exec();
-
-     // repeat for keybindings
-     templatename = "keybindings_" + templatenumber ;
-     query.prepare( "delete from "  + templatename +  " where hostname=:HOSTNAME   ;"  );
-    query.bindValue( ":HOSTNAME" ,   gContext->GetHostName()  );
-    query.exec();
-
-     query.prepare( "replace into "  + templatename +  " (select * from keybindings  where hostname=:HOSTNAME  ) ;"  );
-    query.bindValue( ":HOSTNAME" ,   gContext->GetHostName()  );
-    query.exec();
-
-}
-
-void restoresettings (QString templatenumber )
-{
- cout << "RESTORING....." << templatenumber << endl;
-// DEFAULT settings are handled by the copy from routine
-  MSqlQuery query(MSqlQuery::InitCon());
-    QStringList tablelist ;
-    QStringList::Iterator it;
-    QString current_table;
-    tablelist.append ("settings");
-    tablelist.append ("keybindings");
-    QString templatename;
-
-    for ( it = tablelist.begin(); it != tablelist.end(); ++it )
-    {
-     current_table = *it ;
-    //find template table to use
-    QString templatename =  current_table + "_" + templatenumber ;
-    QString temptable="temp_table_" + current_table + "_" +   gContext->GetHostName() ;
-     // create temp table for merging settings,  The merge is needed to accoutn for any new settings.
-    create_temp_table(temptable, current_table );
-
-    // copy in current settings
-    query.prepare( "replace into  " + temptable + "  (select * from  " + current_table + "  where hostname=:HOSTNAME ) ; "  );
-    query.bindValue( ":HOSTNAME" ,   gContext->GetHostName()  );
-    query.exec();
-
-    // need to remove all non HOST settigns
-
-    // copy in stored settings
-    query.prepare( "replace into  " + temptable + "  (select * from  " + templatename + "  where hostname=:HOSTNAME ) ; "  );
-    query.bindValue( ":HOSTNAME" ,   gContext->GetHostName()  );
-    query.exec();
-
-     // remove current settings.  Need to remove because the old table allows for duplicates and replace into doesn' seem to "replace"
-     query.prepare( "delete from " + current_table + "  where hostname=:HOSTNAME ;"  );
-     query.bindValue( ":HOSTNAME" ,   gContext->GetHostName()  );
-     query.exec();
-
-
-     // copy new settings from temp to current
-     query.prepare( "replace into " + current_table  + "   (select * from  " + temptable + "  );"  );
-     query.exec();
-
-    // drop temptable
-     drop_temp_table(temptable);
-
-    }
-restart_frontend();
-};
-
-void c_from(QString copyhost, QString templatenumber)
-{
-       cout << "Copying....." + copyhost + " " + "templatenumber"   << endl;
-     MSqlQuery query(MSqlQuery::InitCon());
-    //Create temp table, copy in settings from host_template, update hostname for new host,copy temp_table to settings.
-     QStringList tablelist ;
-    QStringList::Iterator it;
-    QString current_table ;
-    tablelist.append ("settings");
-    tablelist.append ("keybindings");
-    QString templatename;
-    QString temptable;
-    for ( it = tablelist.begin(); it != tablelist.end(); ++it )
-    {
-        current_table = *it ;
-        cout << current_table << endl;
-       //find template table to use
-       if  ( templatenumber == "Current" )
-             templatename =  current_table  ;
-        else
-             templatename =  current_table + "_" + templatenumber ;
-
-       temptable="temp_table_" + current_table + "_" +   gContext->GetHostName() ;
-        // create temp table for merging settings
-
-        create_temp_table(temptable, current_table );
-        cout << temptable + "  "         + current_table << endl;
-
-  //  copy current settings from  this host  into temptable minus all Mythvantage settings
-      if ( current_table == "settings")
-        {
-           query.prepare( "replace into  " + temptable + "    (select * from  " + current_table + "  where hostname=:HOSTNAME and value not like 'HOST%'  ) ; "  );
-           query.bindValue( ":HOSTNAME" ,   gContext->GetHostName()  );
-        }
-        else
-         query.prepare( "replace into  " + temptable + "    (select * from  " + current_table + " where hostname=:HOSTNAME ) ; "  );
-         query.bindValue( ":HOSTNAME" ,   gContext->GetHostName()  );
-         query.exec();
-
-   // update hostname to match whatever the hostname of the template is
-    query.prepare ("update " + temptable + "  set hostname=:HOSTNAME ; " );
-    query.bindValue( ":HOSTNAME" ,  copyhost  );
-    query.exec();
-
-     // copy current settings from copy host  into temptable minus all Mythvantage settings
-      if ( current_table == "settings")
-          query.prepare( "replace into  " + temptable + "    (select * from  " + templatename  + "  where hostname=:HOSTNAME and value not like 'HOST%'  ) ; "  );
-
-      else
-            query.prepare( "replace into  " + temptable + "    (select * from  " + templatename  + "  where hostname=:HOSTNAME  ) ; "  );
-
-      query.bindValue( ":HOSTNAME" ,  copyhost  );
-      query.exec();
-
-  //update hostname
-    query.prepare ("update " + temptable + "  set hostname=:HOSTNAME ; " );
-    query.bindValue( ":HOSTNAME" ,   gContext->GetHostName()  );
-    query.exec();
-
-    // delete old settings from settings table
-    if ( current_table == "settings")
-    {
-        query.prepare( "delete from " + current_table + "   where hostname=:HOSTNAME and value not like 'HOST%' ;"  );
-        query.bindValue( ":HOSTNAME" ,   gContext->GetHostName()  );
-    }
-    else
-    {
-        query.prepare( "delete from " + current_table + "   where hostname=:HOSTNAME ;"  );
-        query.bindValue( ":HOSTNAME" ,   gContext->GetHostName()  );
-    }
-    query.exec();
-
-    // copy settings from temptable to settings
-     if ( current_table == "settings")
-       query.prepare( "replace into " + current_table + "   (select * from  " + temptable + " where value not like 'HOST% ' ) ;"  );
-    else
-         query.prepare( "replace into " + current_table + "   (select * from  " + temptable + " );"  );
-
-
-      query.exec();
-
-  //  drop temptable
-   // drop_temp_table(temptable);
-
-
-restart_frontend();
-};
-
-
-};
-
-
-
-
- static HostComboBox *HOSTtemplatetype()
-{
-    HostComboBox *gc = new HostComboBox("HOSTtemplatetype");
-    gc->setLabel(QObject::tr("Template options"));
-    gc->addSelection("Do Nothing") ;
-    gc->addSelection("restore");
-    gc->addSelection("save") ;
-    gc->addSelection("copy_from");
-
-    gc->setHelpText(QObject::tr("Select the name to save, this will make a copy of your keybindings and videoplayback.  Choose none if you do not wish to change anything."));
-
-    return gc;
-}
-
- static HostComboBox *HostTemplateSave()
-{
-    HostComboBox *gc = new HostComboBox("HostTemplateSave");
-    gc->setLabel(QObject::tr("Save Template"));
- //   gc->addSelection("none");
-    gc->addSelection("user1") ;
-    gc->addSelection("user2") ;
-    gc->addSelection("user3") ;
-    gc->setHelpText(QObject::tr("Select the name to save, this will make a copy of your keybindings and videoplayback.  Choose none if you do not wish to change anything."));
-
-    return gc;
-}
- static HostComboBox *HostTemplateCopy_restore()
-{
-    HostComboBox *gc = new HostComboBox("HostTemplateRestore");
-    gc->setLabel(QObject::tr("Template"));
-  //  gc->addSelection("none");
-    gc->addSelection("Current");
-    gc->addSelection("user1") ;
-    gc->addSelection("user2") ;
-    gc->addSelection("user3") ;
-    gc->setHelpText(QObject::tr("Select the template you wish to restore.  This will change the way Myth repsonds to you remote buttons.  Choose none if you do not wish to change anything."));
-
-    return gc;
-}
-
- static HostComboBox *HostTemplateRestore()
-{
-    HostComboBox *gc = new HostComboBox("HostTemplateRestore");
-    gc->setLabel(QObject::tr("Template"));
-  //  gc->addSelection("none");
-    gc->addSelection("default_1");
-    gc->addSelection("default_2");
-    gc->addSelection("user1") ;
-    gc->addSelection("user2") ;
-    gc->addSelection("user3") ;
-    gc->setHelpText(QObject::tr("Select the template you wish to restore.  This will change the way Myth repsonds to you remote buttons.  Choose none if you do not wish to change anything."));
-
-    return gc;
-}
-
- static HostComboBox *HostSelectcopy_from()
-{
-    HostComboBox *gc = new HostComboBox("HostSelectcopy_from");
-    gc->setLabel(QObject::tr("Host"));
-  //  gc->addSelection("none");
-
-   QString tempItem;
-
-    MSqlQuery query(MSqlQuery::InitCon());
-
-    query.prepare( "SELECT DISTINCT hostname from settings where hostname is not null;");
-
-      if (query.exec() && query.isActive() && query.size() > 0)
-    {
-        while (query.next())
-        {
-            tempItem = query.value(0).toString();
-            gc->addSelection(tempItem);
-
-        }
-    }
-    gc->setHelpText(QObject::tr("Select the Host you wish to copy settings from."));
-
-    return gc;
-}
-
-class TemplateSettings:
-                       public TriggeredConfigurationGroup {
-public:
-    TemplateSettings():
-         //ConfigurationGroup(false, true, false, false),
-         //VerticalConfigurationGroup(false, true, false, false),
-         TriggeredConfigurationGroup(true) {
-         setLabel(QObject::tr("Manage templates"));
-//         setUseLabel(false);
-
-         Setting* Mtemplate = HOSTtemplatetype();
-         addChild(Mtemplate);
-         setTrigger(Mtemplate);
-
-
-         ConfigurationGroup* trestore = new VerticalConfigurationGroup(false);
-         trestore->addChild(HostTemplateRestore());
-
-  	     ConfigurationGroup* tsave = new VerticalConfigurationGroup(false);
-         tsave->addChild(HostTemplateSave());
-
-        ConfigurationGroup* tcopy = new VerticalConfigurationGroup(false);
-         tcopy->addChild(HostSelectcopy_from());
-         tcopy->addChild(HostTemplateCopy_restore());
-
-
-        addTarget("Do Nothing", new VerticalConfigurationGroup(true));
-	    addTarget("restore", trestore);
-	    addTarget("save", tsave);
-        addTarget("copy_from", tcopy);
-
-     };
-};
-
-MythCtemplate::MythCtemplate()
-{
-
-        TemplateSettings *templatesettings = new TemplateSettings();
-        addChild(templatesettings);
-
-}
-
-
-
diff --git a/abs/core-testing/mythinstall/settemplate.h b/abs/core-testing/mythinstall/settemplate.h
deleted file mode 100755
index a730cf5..0000000
--- a/abs/core-testing/mythinstall/settemplate.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <settings.h>
-#include "mythdialogs.h"
-
-class MythCtemplate: public ConfigurationWizard {
-public:
-    MythCtemplate();
-
-};
-
-void choosetemplate(QString,QString,QString);
-void savesettings(QString);
-void restoresettings(QString);
-void c_from(QString , QString="current" );
diff --git a/abs/core-testing/mythinstall/statusbox.cpp b/abs/core-testing/mythinstall/statusbox.cpp
deleted file mode 100755
index fd8a6cd..0000000
--- a/abs/core-testing/mythinstall/statusbox.cpp
+++ /dev/null
@@ -1,1411 +0,0 @@
-#include <qlayout.h>
-#include <qiconview.h>
-#include <qsqldatabase.h>
-#include <qwidgetstack.h>
-#include <qvbox.h>
-#include <qgrid.h>
-#include <qregexp.h>
-#include <qhostaddress.h>
-
-#include <unistd.h>
-
-#include <iostream>
-#include <cerrno>
-using namespace std;
-
-#include "config.h"
-#include "statusbox.h"
-#include "mythcontext.h"
-#include "remoteutil.h"
-#include "programinfo.h"
-#include "tv.h"
-#include "jobqueue.h"
-#include "util.h"
-#include "mythdbcon.h"
-#include "cardutil.h"
-
-#define REC_CAN_BE_DELETED(rec) \
-    ((((rec)->programflags & FL_INUSEPLAYING) == 0) && \
-     ((((rec)->programflags & FL_INUSERECORDING) == 0) || \
-      ((rec)->recgroup != "LiveTV")))
-
-
-/** \class StatusBox
- *  \brief Reports on various status items.
- *
- *  StatusBox reports on the listing status, that is how far
- *  into the future program listings exits. It also reports
- *  on the status of each tuner, the log entries, the status
- *  of the job queue, and the machine status.
- */
-
-StatusBox::StatusBox(MythMainWindow *parent, const char *name)
-    : MythDialog(parent, name), errored(false)
-{
-    // Set this value to the number of items in icon_list
-    // to prevent scrolling off the bottom
-    int item_count = 0;
-    dateFormat = gContext->GetSetting("ShortDateFormat", "M/d");
-    timeFormat = gContext->GetSetting("TimeFormat", "h:mm AP");
-    timeDateFormat = timeFormat + " " + dateFormat;
-
-    setNoErase();
-    LoadTheme();
-    if (IsErrored())
-        return;
-  
-    icon_list->SetItemText(item_count++, QObject::tr("Listings Status"));
-    icon_list->SetItemText(item_count++, QObject::tr("Tuner Status"));
-    icon_list->SetItemText(item_count++, QObject::tr("Log Entries"));
-    icon_list->SetItemText(item_count++, QObject::tr("Job Queue"));
-    icon_list->SetItemText(item_count++, QObject::tr("Machine Status"));
-    icon_list->SetItemText(item_count++, QObject::tr("AutoExpire List"));
-    icon_list->SetItemCurrent(0);
-    icon_list->SetActive(true);
-
-    QStringList strlist;
-    strlist << "QUERY_IS_ACTIVE_BACKEND";
-    strlist << gContext->GetHostName();
-
-    gContext->SendReceiveStringList(strlist);
-
-    if (QString(strlist[0]) == "FALSE")
-        isBackend = false;
-    else if (QString(strlist[0]) == "TRUE")
-        isBackend = true;
-    else
-        isBackend = false;
-
-    VERBOSE(VB_NETWORK, QString("QUERY_IS_ACTIVE_BACKEND=%1").arg(strlist[0]));
-
-    max_icons = item_count;
-    inContent = false;
-    contentPos = 0;
-    contentTotalLines = 0;
-    contentSize = 0;
-    contentMid = 0;
-    min_level = gContext->GetNumSetting("LogDefaultView",5);
-    my_parent = parent;
-    clicked();
-
-    gContext->addCurrentLocation("StatusBox");
-}
-
-StatusBox::~StatusBox(void)
-{
-    gContext->removeCurrentLocation();
-}
-
-void StatusBox::paintEvent(QPaintEvent *e)
-{
-    QRect r = e->rect();
-
-    if (r.intersects(TopRect))
-        updateTopBar();
-    if (r.intersects(SelectRect))
-        updateSelector();
-    if (r.intersects(ContentRect))
-        updateContent();
-}
-
-void StatusBox::updateContent()
-{
-    QRect pr = ContentRect;
-    QPixmap pix(pr.size());
-    pix.fill(this, pr.topLeft());
-    QPainter tmp(&pix);
-    QPainter p(this);
-
-    // Normalize the variables here and set the contentMid
-    contentSize = list_area->GetItems();
-    if (contentSize > contentTotalLines)
-        contentSize = contentTotalLines;
-    contentMid = contentSize / 2;
-
-    int startPos = 0;
-    int highlightPos = 0;
-
-    if (contentPos < contentMid)
-    {
-        startPos = 0;
-        highlightPos = contentPos;
-    }
-    else if (contentPos >= (contentTotalLines - contentMid))
-    {
-        startPos = contentTotalLines - contentSize;
-        highlightPos = contentSize - (contentTotalLines - contentPos);
-    }
-    else if (contentPos >= contentMid)
-    {
-        startPos = contentPos - contentMid;
-        highlightPos = contentMid;
-    }
- 
-    if (content  == NULL) return;
-    LayerSet *container = content;
-
-    list_area->ResetList();
-    for (int x = startPos; (x - startPos) <= contentSize; x++)
-    {
-        if (contentLines.contains(x))
-        {
-            list_area->SetItemText(x - startPos, contentLines[x]);
-            if (contentFont.contains(x))
-                list_area->EnableForcedFont(x - startPos, contentFont[x]);
-        }
-    }
-
-    list_area->SetItemCurrent(highlightPos);
-
-    if (inContent)
-    {
-        helptext->SetText(contentDetail[contentPos]);
-        update(TopRect);
-    }
-
-    list_area->SetUpArrow((startPos > 0) && (contentSize < contentTotalLines));
-    list_area->SetDownArrow((startPos + contentSize) < contentTotalLines);
-
-    container->Draw(&tmp, 0, 0);
-    container->Draw(&tmp, 1, 0);
-    container->Draw(&tmp, 2, 0);
-    container->Draw(&tmp, 3, 0);
-    container->Draw(&tmp, 4, 0);
-    container->Draw(&tmp, 5, 0);
-    container->Draw(&tmp, 6, 0);
-    container->Draw(&tmp, 7, 0);
-    container->Draw(&tmp, 8, 0);
-    tmp.end();
-    p.drawPixmap(pr.topLeft(), pix);
-}
-
-void StatusBox::updateSelector()
-{
-    QRect pr = SelectRect;
-    QPixmap pix(pr.size());
-    pix.fill(this, pr.topLeft());
-    QPainter tmp(&pix);
-    QPainter p(this);
- 
-    if (selector == NULL) return;
-    LayerSet *container = selector;
-
-    container->Draw(&tmp, 0, 0);
-    container->Draw(&tmp, 1, 0);
-    container->Draw(&tmp, 2, 0);
-    container->Draw(&tmp, 3, 0);
-    container->Draw(&tmp, 4, 0);
-    container->Draw(&tmp, 5, 0);
-    container->Draw(&tmp, 6, 0);
-    container->Draw(&tmp, 7, 0);
-    container->Draw(&tmp, 8, 0);
-    tmp.end();
-    p.drawPixmap(pr.topLeft(), pix);
-}
-
-void StatusBox::updateTopBar()
-{
-    QRect pr = TopRect;
-    QPixmap pix(pr.size());
-    pix.fill(this, pr.topLeft());
-    QPainter tmp(&pix);
-    QPainter p(this);
-
-    if (topbar == NULL) return;
-    LayerSet *container = topbar;
-
-    container->Draw(&tmp, 0, 0);
-    tmp.end();
-    p.drawPixmap(pr.topLeft(), pix);
-}
-
-void StatusBox::LoadTheme()
-{
-    int screenheight = 0, screenwidth = 0;
-    float wmult = 0, hmult = 0;
-
-    gContext->GetScreenSettings(screenwidth, wmult, screenheight, hmult);
-
-    theme = new XMLParse();
-    theme->SetWMult(wmult);
-    theme->SetHMult(hmult);
-    if (!theme->LoadTheme(xmldata, "status", "status-"))
-    {
-        VERBOSE(VB_IMPORTANT, "StatusBox: Unable to load theme.");
-        errored = true;
-        return;
-    }
-
-    for (QDomNode child = xmldata.firstChild(); !child.isNull();
-         child = child.nextSibling()) {
-
-        QDomElement e = child.toElement();
-        if (!e.isNull()) {
-            if (e.tagName() == "font") {
-                theme->parseFont(e);
-            }
-            else if (e.tagName() == "container") {
-                QRect area;
-                QString name;
-                int context;
-                theme->parseContainer(e, name, context, area);
-
-                if (name.lower() == "topbar")
-                    TopRect = area;
-                if (name.lower() == "selector")
-                    SelectRect = area;
-                if (name.lower() == "content")
-                    ContentRect = area;
-            }
-            else {
-                QString msg =
-                    QString(tr("The theme you are using contains an "
-                               "unknown element ('%1').  It will be ignored"))
-                    .arg(e.tagName());
-                VERBOSE(VB_IMPORTANT, msg);
-                errored = true;
-            }
-        }
-    }
-
-    selector = theme->GetSet("selector");
-    if (!selector)
-    {
-        VERBOSE(VB_IMPORTANT, "StatusBox: Failed to get selector container.");
-        errored = true;
-    }
-
-    icon_list = (UIListType*)selector->GetType("icon_list");
-    if (!icon_list)
-    {
-        VERBOSE(VB_IMPORTANT, "StatusBox: Failed to get icon list area.");
-        errored = true;
-    }
-
-    content = theme->GetSet("content");
-    if (!content)
-    {
-        VERBOSE(VB_IMPORTANT, "StatusBox: Failed to get content container.");
-        errored = true;
-    }
-
-    list_area = (UIListType*)content->GetType("list_area");
-    if (!list_area)
-    {
-        VERBOSE(VB_IMPORTANT, "StatusBox: Failed to get list area.");
-        errored = true;
-    }
-
-    topbar = theme->GetSet("topbar");
-    if (!topbar)
-    {
-        VERBOSE(VB_IMPORTANT, "StatusBox: Failed to get topbar container.");
-        errored = true;
-    }
-
-    heading = (UITextType*)topbar->GetType("heading");
-    if (!heading)
-    {
-        VERBOSE(VB_IMPORTANT, "StatusBox: Failed to get heading area.");
-        errored = true;
-    }
-
-    helptext = (UITextType*)topbar->GetType("helptext");
-    if (!helptext)
-    {
-        VERBOSE(VB_IMPORTANT, "StatusBox: Failed to get helptext area.");
-        errored = true;
-    }
-}
-
-void StatusBox::keyPressEvent(QKeyEvent *e)
-{
-    bool handled = false;
-    QStringList actions;
-    gContext->GetMainWindow()->TranslateKeyPress("Status", e, actions);
-
-    for (unsigned int i = 0; i < actions.size() && !handled; i++)
-    {
-        QString action = actions[i];
-        QString currentItem;
-        QRegExp logNumberKeys( "^[12345678]$" );
-
-        currentItem = icon_list->GetItemText(icon_list->GetCurrentItem());
-        handled = true;
-
-        if (action == "SELECT")
-        {
-            clicked();
-        }
-        else if (action == "MENU")
-        {
-            if ((inContent) &&
-                (currentItem == QObject::tr("Log Entries")))
-            {
-                int retval = MythPopupBox::show2ButtonPopup(my_parent,
-                                 QString("AckLogEntry"),
-                                 QObject::tr("Acknowledge all log entries at "
-                                             "this priority level or lower?"),
-                                 QObject::tr("Yes"), QObject::tr("No"), 0);
-                if (retval == 0)
-                {
-                    MSqlQuery query(MSqlQuery::InitCon());
-                    query.prepare("UPDATE mythlog SET acknowledged = 1 "
-                                  "WHERE priority <= :PRIORITY ;");
-                    query.bindValue(":PRIORITY", min_level);
-                    query.exec();
-                    doLogEntries();
-                }
-            }
-            else if ((inContent) &&
-                     (currentItem == QObject::tr("Job Queue")))
-            {
-                clicked();
-            }
-        }
-        else if (action == "UP")
-        {
-            if (inContent)
-            {
-                if (contentPos > 0)
-                    contentPos--;
-                update(ContentRect);
-            }
-            else
-            {
-                if (icon_list->GetCurrentItem() > 0)
-                    icon_list->SetItemCurrent(icon_list->GetCurrentItem()-1);
-                clicked();
-                setHelpText();
-                update(SelectRect);
-            }
-
-        }
-        else if (action == "DOWN")
-        {
-            if (inContent)
-            {
-                if (contentPos < (contentTotalLines - 1))
-                    contentPos++;
-                update(ContentRect);
-            }
-            else
-            {
-                if (icon_list->GetCurrentItem() < (max_icons - 1))
-                    icon_list->SetItemCurrent(icon_list->GetCurrentItem()+1);
-                clicked();
-                setHelpText();
-                update(SelectRect);
-            }
-        }
-        else if (action == "PAGEUP" && inContent) 
-        {
-            contentPos -= contentSize;
-            if (contentPos < 0)
-                contentPos = 0;
-            update(ContentRect);
-        }
-        else if (action == "PAGEDOWN" && inContent)
-        {
-            contentPos += contentSize;
-            if (contentPos > (contentTotalLines - 1))
-                contentPos = contentTotalLines - 1;
-            update(ContentRect);
-        }
-        else if ((action == "RIGHT") &&
-                 (!inContent) &&
-                 ((contentTotalLines > contentSize) ||
-                  (doScroll)))
-        {
-            clicked();
-            inContent = true;
-            contentPos = 0;
-            icon_list->SetActive(false);
-            list_area->SetActive(true);
-            update(SelectRect);
-            update(ContentRect);
-        }
-        else if (action == "LEFT")
-        {
-            if (inContent)
-            {
-                inContent = false;
-                contentPos = 0;
-                list_area->SetActive(false);
-                icon_list->SetActive(true);
-                setHelpText();
-                update(SelectRect);
-                update(ContentRect);
-            }
-            else
-            {
-                if (gContext->GetNumSetting("UseArrowAccels", 1))
-                    accept();
-            }
-        }
-        else if ((currentItem == QObject::tr("Log Entries")) &&
-                 (logNumberKeys.search(action) == 0))
-        {
-            min_level = action.toInt();
-            helptext->SetText(QObject::tr("Setting priority level to %1")
-                                          .arg(min_level));
-            update(TopRect);
-            doLogEntries();
-        }
-        else
-            handled = false;
-    }
-
-    if (!handled)
-        MythDialog::keyPressEvent(e);
-}
-
-void StatusBox::setHelpText()
-{
-    if (inContent)
-    {
-        helptext->SetText(contentDetail[contentPos]);
-    } else {
-        topbar->ClearAllText();
-        QString currentItem;
-
-        currentItem = icon_list->GetItemText(icon_list->GetCurrentItem());
-
-        if (currentItem == QObject::tr("Listings Status"))
-            helptext->SetText(QObject::tr("Listings Status shows the latest "
-                                          "status information from "
-                                          "mythfilldatabase"));
-
-        if (currentItem == QObject::tr("Tuner Status"))
-            helptext->SetText(QObject::tr("Tuner Status shows the current "
-                                          "information about the state of "
-                                          "backend tuner cards"));
-
-        if (currentItem == QObject::tr("DVB Status"))
-            helptext->SetText(QObject::tr("DVB Status shows the quality "
-                                          "statistics of all DVB cards, if "
-                                          "present"));
-
-        if (currentItem == QObject::tr("Log Entries"))
-            helptext->SetText(QObject::tr("Log Entries shows any unread log "
-                                          "entries from the system if you "
-                                          "have logging enabled"));
-        if (currentItem == QObject::tr("Job Queue"))
-            helptext->SetText(QObject::tr("Job Queue shows any jobs currently "
-                                          "in Myth's Job Queue such as a "
-                                          "commercial flagging job."));
-        if (currentItem == QObject::tr("Machine Status"))
-        {
-            QString machineStr = QObject::tr("Machine Status shows "
-                                             "some operating system "
-                                             "statistics of this machine");
-            if (!isBackend)
-                machineStr.append(" " + QObject::tr("and the MythTV server"));
-
-            helptext->SetText(machineStr);
-        }
-
-        if (currentItem == QObject::tr("AutoExpire List"))
-            helptext->SetText(QObject::tr("The AutoExpire List shows all "
-                "recordings which may be expired and the order of their "
-                "expiration. Recordings at the top of the list will be "
-                "expired first."));
-    }
-    update(TopRect);
-}
-
-void StatusBox::clicked()
-{
-    QString currentItem = icon_list->GetItemText(icon_list->GetCurrentItem());
-
-    if (inContent)
-    {
-        if (currentItem == QObject::tr("Log Entries"))
-        {
-            int retval;
-
-            retval = MythPopupBox::show2ButtonPopup(my_parent,
-                                   QString("AckLogEntry"),
-                                   QObject::tr("Acknowledge this log entry?"),
-                                   QObject::tr("Yes"), QObject::tr("No"), 0);
-            if (retval == 0)
-            {
-                MSqlQuery query(MSqlQuery::InitCon());
-                query.prepare("UPDATE mythlog SET acknowledged = 1 "
-                              "WHERE logid = :LOGID ;");
-                query.bindValue(":LOGID", contentData[contentPos]);
-                query.exec();
-                doLogEntries();
-            }
-        }
-        else if (currentItem == QObject::tr("Job Queue"))
-        {
-            QStringList msgs;
-            int jobStatus;
-            int retval;
-
-            jobStatus = JobQueue::GetJobStatus(
-                                contentData[contentPos].toInt());
-
-            if (jobStatus == JOB_QUEUED)
-            {
-                retval = MythPopupBox::show2ButtonPopup(my_parent,
-                                       QString("JobQueuePopup"),
-                                       QObject::tr("Delete Job?"),
-                                       QObject::tr("Yes"),
-                                       QObject::tr("No"), 1);
-                if (retval == 0)
-                {
-                    JobQueue::DeleteJob(contentData[contentPos].toInt());
-                    doJobQueueStatus();
-                }
-            }
-            else if ((jobStatus == JOB_PENDING) ||
-                     (jobStatus == JOB_STARTING) ||
-                     (jobStatus == JOB_RUNNING))
-            {
-                msgs << QObject::tr("Pause");
-                msgs << QObject::tr("Stop");
-                msgs << QObject::tr("No Change");
-                retval = MythPopupBox::showButtonPopup(my_parent,
-                                       QString("JobQueuePopup"),
-                                       QObject::tr("Job Queue Actions:"),
-                                       msgs, 2);
-                if (retval == 0)
-                {
-                    JobQueue::PauseJob(contentData[contentPos].toInt());
-                    doJobQueueStatus();
-                }
-                else if (retval == 1)
-                {
-                    JobQueue::StopJob(contentData[contentPos].toInt());
-                    doJobQueueStatus();
-                }
-            }
-            else if (jobStatus == JOB_PAUSED)
-            {
-                msgs << QObject::tr("Resume");
-                msgs << QObject::tr("Stop");
-                msgs << QObject::tr("No Change");
-                retval = MythPopupBox::showButtonPopup(my_parent,
-                                       QString("JobQueuePopup"),
-                                       QObject::tr("Job Queue Actions:"),
-                                       msgs, 2);
-                if (retval == 0)
-                {
-                    JobQueue::ResumeJob(contentData[contentPos].toInt());
-                    doJobQueueStatus();
-                }
-                else if (retval == 1)
-                {
-                    JobQueue::StopJob(contentData[contentPos].toInt());
-                    doJobQueueStatus();
-                }
-            }
-            else if (jobStatus & JOB_DONE)
-            {
-                retval = MythPopupBox::show2ButtonPopup(my_parent,
-                                       QString("JobQueuePopup"),
-                                       QObject::tr("Requeue Job?"),
-                                       QObject::tr("Yes"),
-                                       QObject::tr("No"), 1);
-                if (retval == 0)
-                {
-                    JobQueue::ChangeJobStatus(contentData[contentPos].toInt(),
-                                              JOB_QUEUED);
-                    doJobQueueStatus();
-                }
-            }
-        }
-        else if (currentItem == QObject::tr("AutoExpire List"))
-        {
-            ProgramInfo* rec;
-
-            rec = expList[contentPos];
-
-            if (rec) 
-            {
-                QStringList msgs;
-                int retval;
-
-                msgs << QObject::tr("Delete Now");
-                msgs << QObject::tr("Disable AutoExpire");
-                msgs << QObject::tr("No Change");
-                
-                retval = MythPopupBox::showButtonPopup(my_parent,
-                             QString("AutoExpirePopup"),
-                             QObject::tr("AutoExpire Actions:"),
-                             msgs, 2);
-
-                if (retval == 0 && REC_CAN_BE_DELETED(rec))
-                {
-                    RemoteDeleteRecording(rec, false, false);
-                }
-                else if (retval == 1)
-                {
-                    rec->SetAutoExpire(0);
-                    if ((rec)->recgroup == "LiveTV")
-                        rec->ApplyRecordRecGroupChange("Default");
-                }
-
-                // Update list, prevent selected item going off bottom
-                doAutoExpireList();
-                if (contentPos >= (int)expList.size())  
-                    contentPos = max((int)expList.size()-1,0);
-            }
-        }
-        return;
-    }
-    
-    // Clear all visible content elements here
-    // I'm sure there's a better way to do this but I can't find it
-    content->ClearAllText();
-    list_area->ResetList();
-    contentLines.clear();
-    contentDetail.clear();
-    contentFont.clear();
-    contentData.clear();
-
-    if (currentItem == QObject::tr("Listings Status"))
-        doListingsStatus();
-    else if (currentItem == QObject::tr("Tuner Status"))
-        doTunerStatus();
-    else if (currentItem == QObject::tr("Log Entries"))
-        doLogEntries();
-    else if (currentItem == QObject::tr("Job Queue"))
-        doJobQueueStatus();
-    else if (currentItem == QObject::tr("Machine Status"))
-        doMachineStatus();
-    else if (currentItem == QObject::tr("AutoExpire List"))
-        doAutoExpireList();
-}
-
-void StatusBox::doListingsStatus()
-{
-    QString mfdLastRunStart, mfdLastRunEnd, mfdLastRunStatus, mfdNextRunStart;
-    QString querytext, Status, DataDirectMessage;
-    int DaysOfData;
-    QDateTime qdtNow, GuideDataThrough;
-    int count = 0;
-
-    contentLines.clear();
-    contentDetail.clear();
-    contentFont.clear();
-    doScroll = false;
-
-    qdtNow = QDateTime::currentDateTime();
-
-    MSqlQuery query(MSqlQuery::InitCon());
-    query.prepare("SELECT max(endtime) FROM program WHERE manualid=0;");
-    query.exec();
-
-    if (query.isActive() && query.size())
-    {
-        query.next();
-        GuideDataThrough = QDateTime::fromString(query.value(0).toString(),
-                                                 Qt::ISODate);
-    }
-
-    mfdLastRunStart = gContext->GetSetting("mythfilldatabaseLastRunStart");
-    mfdLastRunEnd = gContext->GetSetting("mythfilldatabaseLastRunEnd");
-    mfdLastRunStatus = gContext->GetSetting("mythfilldatabaseLastRunStatus");
-    mfdNextRunStart = gContext->GetSetting("MythFillSuggestedRunTime");
-    DataDirectMessage = gContext->GetSetting("DataDirectMessage");
-
-    mfdNextRunStart.replace("T", " ");
-
-    extern const char *myth_source_version;
-    contentLines[count++] = QObject::tr("Myth version:") + " " +
-                                        MYTH_BINARY_VERSION + "   " +
-                                        myth_source_version;
-    contentLines[count++] = QObject::tr("Last mythfilldatabase guide update:");
-    contentLines[count++] = QObject::tr("Started:   ") + mfdLastRunStart;
-
-    if (mfdLastRunEnd >= mfdLastRunStart) //if end < start, it's still running.
-        contentLines[count++] = QObject::tr("Finished: ") + mfdLastRunEnd;
-
-    contentLines[count++] = QObject::tr("Result: ") + mfdLastRunStatus;
-
-
-    if (mfdNextRunStart >= mfdLastRunStart) 
-        contentLines[count++] = QObject::tr("Suggested Next: ") + 
-                                mfdNextRunStart;
-
-    DaysOfData = qdtNow.daysTo(GuideDataThrough);
-
-    if (GuideDataThrough.isNull())
-    {
-        contentLines[count++] = "";
-        contentLines[count++] = QObject::tr("There's no guide data available!");
-        contentLines[count++] = QObject::tr("Have you run mythfilldatabase?");
-    }
-    else
-    {
-        contentLines[count++] = QObject::tr("There is guide data until ") + 
-                                QDateTime(GuideDataThrough)
-                                          .toString("yyyy-MM-dd hh:mm");
-
-        if (DaysOfData > 0)
-        {
-            Status = QString("(%1 ").arg(DaysOfData);
-            if (DaysOfData >1)
-                Status += QObject::tr("days");
-            else
-                Status += QObject::tr("day");
-            Status += ").";
-            contentLines[count++] = Status;
-        }
-    }
-
-    if (DaysOfData <= 3)
-    {
-        contentLines[count++] = QObject::tr("WARNING: is mythfilldatabase "
-                                            "running?");
-    }
-
-    if (!DataDirectMessage.isNull())
-    {
-        contentLines[count++] = QObject::tr("DataDirect Status: "); 
-        contentLines[count++] = DataDirectMessage;
-    }
-   
-    contentTotalLines = count;
-    update(ContentRect);
-}
-
-void StatusBox::doTunerStatus()
-{
-    doScroll = true;
-    contentLines.clear();
-    contentDetail.clear();
-    contentFont.clear();
-
-    MSqlQuery query(MSqlQuery::InitCon());
-    query.prepare(
-        "SELECT cardid, cardtype, videodevice "
-        "FROM capturecard WHERE parentid='0' ORDER BY cardid");
-
-    if (!query.exec() || !query.isActive())
-    {
-        MythContext::DBError("StatusBox::doTunerStatus()", query);
-        contentTotalLines = 0;
-        update(ContentRect);
-        return;
-    }
-
-    uint count = 0;
-    while (query.next())
-    {
-        int cardid = query.value(0).toInt();
-
-        QString cmd = QString("QUERY_REMOTEENCODER %1").arg(cardid);
-        QStringList strlist = cmd;
-        strlist << "GET_STATE";
-
-        gContext->SendReceiveStringList(strlist);
-        int state = strlist[0].toInt();
-  
-        QString status = "";
-        if (state == kState_Error)
-            status = tr("is unavailable");
-        else if (state == kState_WatchingLiveTV)
-            status = tr("is watching live TV");
-        else if (state == kState_RecordingOnly ||
-                 state == kState_WatchingRecording)
-            status = tr("is recording");
-        else 
-            status = tr("is not recording");
-
-        QString tun = tr("Tuner %1 ").arg(cardid);
-        QString devlabel = CardUtil::GetDeviceLabel(
-            cardid, query.value(1).toString(), query.value(2).toString());
-
-        contentLines[count]  = tun + status;
-        contentDetail[count] = tun + devlabel + " " + status;
-
-        if (state == kState_RecordingOnly ||
-            state == kState_WatchingRecording)
-        {
-            strlist = QString("QUERY_RECORDER %1").arg(cardid);
-            strlist << "GET_RECORDING";
-            gContext->SendReceiveStringList(strlist);
-            ProgramInfo *proginfo = new ProgramInfo;
-            proginfo->FromStringList(strlist, 0);
-   
-            status += " " + proginfo->title;
-            status += "\n";
-            status += proginfo->subtitle;
-            contentDetail[count] = tun + devlabel + " " + status;
-        }
-        count++;
-    }
-    contentTotalLines = count;
-    update(ContentRect);
-}
-
-void StatusBox::doLogEntries(void)
-{
-    QString line;
-    int count = 0;
- 
-    doScroll = true;
-
-    contentLines.clear();
-    contentDetail.clear();
-    contentFont.clear();
-    contentData.clear();
-
-    MSqlQuery query(MSqlQuery::InitCon());
-    query.prepare("SELECT logid, module, priority, logdate, host, "
-                  "message, details "
-                  "FROM mythlog WHERE acknowledged = 0 "
-                  "AND priority <= :PRIORITY ORDER BY logdate DESC;");
-    query.bindValue(":PRIORITY", min_level);
-    query.exec();
-
-    if (query.isActive())
-    {
-        while (query.next())
-        {
-            line = QString("%1").arg(query.value(5).toString());
-            contentLines[count] = line;
-
-            if (query.value(6).toString() != "")
-                line = tr("On %1 %2 from %3.%4\n%5\n%6")
-                               .arg(query.value(3).toDateTime()
-                                         .toString(dateFormat))
-                               .arg(query.value(3).toDateTime()
-                                         .toString(timeFormat))
-                               .arg(query.value(4).toString())
-                               .arg(query.value(1).toString())
-                               .arg(query.value(5).toString())
-                               .arg(QString::fromUtf8(query.value(6).toString()));
-            else
-                line = tr("On %1 %2 from %3.%4\n%5\nNo other details")
-                               .arg(query.value(3).toDateTime()
-                                         .toString(dateFormat))
-                               .arg(query.value(3).toDateTime()
-                                         .toString(timeFormat))
-                               .arg(query.value(4).toString())
-                               .arg(query.value(1).toString())
-                               .arg(query.value(5).toString());
-            contentDetail[count] = line;
-            contentData[count++] = query.value(0).toString();
-        }
-    }
-
-    if (!count)
-    {
-        doScroll = false;
-        contentLines[count++] = QObject::tr("No items found at priority "
-                                            "level %1 or lower.")
-                                            .arg(min_level);
-        contentLines[count++] = QObject::tr("Use 1-8 to change priority "
-                                            "level.");
-    }
-      
-    contentTotalLines = count;
-    if (contentPos > (contentTotalLines - 1))
-        contentPos = contentTotalLines - 1;
-
-    update(ContentRect);
-}
-
-void StatusBox::doJobQueueStatus()
-{
-    QMap<int, JobQueueEntry> jobs;
-    QMap<int, JobQueueEntry>::Iterator it;
-    int count = 0;
-
-    QString detail;
-
-    JobQueue::GetJobsInQueue(jobs,
-                             JOB_LIST_NOT_DONE | JOB_LIST_ERROR |
-                             JOB_LIST_RECENT);
-
-    doScroll = true;
-
-    contentLines.clear();
-    contentDetail.clear();
-    contentFont.clear();
-    contentData.clear();
-
-    if (jobs.size())
-    {
-        for (it = jobs.begin(); it != jobs.end(); ++it)
-        {
-            QString chanid = it.data().chanid;
-            QDateTime starttime = it.data().starttime;
-            ProgramInfo *pginfo;
-
-            pginfo = ProgramInfo::GetProgramFromRecorded(chanid, starttime);
-
-            if (!pginfo)
-                continue;
-
-            detail = pginfo->title + "\n" +
-                     pginfo->channame + " " + pginfo->chanstr +
-                         " @ " + starttime.toString(timeDateFormat) + "\n" +
-                     tr("Job:") + " " + JobQueue::JobText(it.data().type) +
-                     "     " + tr("Status: ") +
-                     JobQueue::StatusText(it.data().status);
-
-            if (it.data().status != JOB_QUEUED)
-                detail += " (" + it.data().hostname + ")";
-
-            detail += "\n" + it.data().comment;
-
-            contentLines[count] = pginfo->title + " @ " +
-                                  starttime.toString(timeDateFormat);
-
-            contentDetail[count] = detail;
-            contentData[count] = QString("%1").arg(it.data().id);
-
-            if (it.data().status == JOB_ERRORED)
-                contentFont[count] = "error";
-            else if (it.data().status == JOB_ABORTED)
-                contentFont[count] = "warning";
-
-            count++;
-
-            delete pginfo;
-        }
-    }
-    else
-    {
-        contentLines[count++] = QObject::tr("Job Queue is currently empty.");
-        doScroll = false;
-    }
-
-    contentTotalLines = count;
-    update(ContentRect);
-}
-
-// Some helper routines for doMachineStatus() that format the output strings
-
-/** \fn sm_str(long long, int)
- *  \brief Returns a short string describing an amount of space, choosing
- *         one of a number of useful units, "TB", "GB", "MB", or "KB".
- *  \param sizeKB Number of kilobytes.
- *  \param prec   Precision to use if we have less than ten of whatever
- *                unit is chosen.
- */
-static const QString sm_str(long long sizeKB, int prec=1)
-{
-    if (sizeKB>1024*1024*1024) // Terabytes
-    {
-        double sizeGB = sizeKB/(1024*1024*1024.0);
-        return QString("%1 TB").arg(sizeGB, 0, 'f', (sizeGB>10)?0:prec);
-    }
-    else if (sizeKB>1024*1024) // Gigabytes
-    {
-        double sizeGB = sizeKB/(1024*1024.0);
-        return QString("%1 GB").arg(sizeGB, 0, 'f', (sizeGB>10)?0:prec);
-    }
-    else if (sizeKB>1024) // Megabytes
-    {
-        double sizeMB = sizeKB/1024.0;
-        return QString("%1 MB").arg(sizeMB, 0, 'f', (sizeMB>10)?0:prec);
-    }
-    // Kilobytes
-    return QString("%1 KB").arg(sizeKB);
-}
-
-static const QString usage_str_kb(long long total,
-                                  long long used,
-                                  long long free)
-{
-    QString ret = QObject::tr("Unknown");
-    if (total > 0.0 && free > 0.0)
-    {
-        double percent = (100.0*free)/total;
-        ret = QObject::tr("%1 total, %2 used, %3 (or %4%) free.")
-            .arg(sm_str(total)).arg(sm_str(used))
-            .arg(sm_str(free)).arg(percent, 0, 'f', (percent >= 10.0) ? 0 : 2);
-    }
-    return ret;
-}
-
-static const QString usage_str_mb(float total, float used, float free)
-{
-    return usage_str_kb((long long)(total*1024), (long long)(used*1024),
-                        (long long)(free*1024));
-}
-
-static void disk_usage_with_rec_time_kb(QStringList& out, long long total,
-                                        long long used, long long free,
-                                        const recprof2bps_t& prof2bps)
-{
-    const QString tail = QObject::tr(", using your %1 rate of %2 Kb/sec");
-
-    out<<usage_str_kb(total, used, free);
-    if (free<0)
-        return;
-
-    recprof2bps_t::const_iterator it = prof2bps.begin();
-    for (; it != prof2bps.end(); ++it)
-    {
-        const QString pro =
-                tail.arg(it.key()).arg((int)((float)it.data() / 1024.0));
-        
-        long long bytesPerMin = (it.data() >> 1) * 15;
-        uint minLeft = ((free<<5)/bytesPerMin)<<5;
-        minLeft = (minLeft/15)*15;
-        uint hoursLeft = minLeft/60;
-        if (hoursLeft > 3)
-            out<<QObject::tr("%1 hours left").arg(hoursLeft) + pro;
-        else if (minLeft > 90)
-            out<<QObject::tr("%1 hours and %2 minutes left")
-                .arg(hoursLeft).arg(minLeft%60) + pro;
-        else
-            out<<QObject::tr("%1 minutes left").arg(minLeft) + pro;
-    }
-}
-
-static const QString uptimeStr(time_t uptime)
-{
-    int     days, hours, min, secs;
-    QString str;
-
-    str = QString("   " + QObject::tr("Uptime") + ": ");
-
-    if (uptime == 0)
-        return str + "unknown";
-
-    days = uptime/(60*60*24);
-    uptime -= days*60*60*24;
-    hours = uptime/(60*60);
-    uptime -= hours*60*60;
-    min  = uptime/60;
-    secs = uptime%60;
-
-    if (days > 0)
-    {
-        char    buff[6];
-        QString dayLabel;
-
-        if (days == 1)
-            dayLabel = QObject::tr("day");
-        else
-            dayLabel = QObject::tr("days");
-
-        sprintf(buff, "%d:%02d", hours, min);
-
-        return str + QString("%1 %2, %3").arg(days).arg(dayLabel).arg(buff);
-    }
-    else
-    {
-        char  buff[9];
-
-        sprintf(buff, "%d:%02d:%02d", hours, min, secs);
-
-        return str + buff;
-    }
-}
-
-/** \fn StatusBox::getActualRecordedBPS(QString hostnames)
- *  \brief Fills in recordingProfilesBPS w/ average bitrate from recorded table
- */
-void StatusBox::getActualRecordedBPS(QString hostnames)
-{
-    recordingProfilesBPS.clear();
-
-    QString querystr;
-    MSqlQuery query(MSqlQuery::InitCon());
-
-    querystr =
-        "SELECT sum(filesize) * 8 / "
-            "sum(((unix_timestamp(endtime) - unix_timestamp(starttime)))) "
-            "AS avg_bitrate "
-        "FROM recorded WHERE hostname in (%1) "
-            "AND (unix_timestamp(endtime) - unix_timestamp(starttime)) > 300;";
-
-    query.prepare(querystr.arg(hostnames));
-
-    if (query.exec() && query.isActive() && query.size() > 0 && query.next() &&
-        query.value(0).toDouble() > 0)
-    {
-        recordingProfilesBPS[QObject::tr("average")] =
-            (int)(query.value(0).toDouble());
-    }
-
-    querystr =
-        "SELECT max(filesize * 8 / "
-            "(unix_timestamp(endtime) - unix_timestamp(starttime))) "
-            "AS max_bitrate "
-        "FROM recorded WHERE hostname in (%1) "
-            "AND (unix_timestamp(endtime) - unix_timestamp(starttime)) > 300;";
-
-    query.prepare(querystr.arg(hostnames));
-
-    if (query.exec() && query.isActive() && query.size() > 0 && query.next() &&
-        query.value(0).toDouble() > 0)
-    {
-        recordingProfilesBPS[QObject::tr("maximum")] =
-            (int)(query.value(0).toDouble());
-    }
-}
-
-/** \fn StatusBox::doMachineStatus()
- *  \brief Show machine status.
- *  
- *   This returns statisics for master backend when using
- *   a frontend only machine. And returns info on the current
- *   system if frontend is running on a backend machine.
- *  \bug We should report on all backends and the current frontend.
- */
-void StatusBox::doMachineStatus()
-{
-    int           count(0);
-    int           totalM, usedM, freeM;    // Physical memory
-    int           totalS, usedS, freeS;    // Virtual  memory (swap)
-    time_t        uptime;
-    int           detailBegin;
-    QString       detailString;
-    int           detailLoop;
-
-    contentLines.clear();
-    contentDetail.clear();
-    contentFont.clear();
-    doScroll = true;
-
-    detailBegin = count;
-    detailString = "";
-
-    if (isBackend)
-        contentLines[count] = QObject::tr("System") + ":";
-    else
-        contentLines[count] = QObject::tr("This machine") + ":";
-    detailString += contentLines[count] + "\n";
-    count++;
-
-    // uptime
-    if (!getUptime(uptime))
-        uptime = 0;
-    contentLines[count] = uptimeStr(uptime);
-
-    // weighted average loads
-    contentLines[count].append(".   " + QObject::tr("Load") + ": ");
-
-    double loads[3];
-    if (getloadavg(loads,3) == -1)
-        contentLines[count].append(QObject::tr("unknown") +
-                                   " - getloadavg() " + QObject::tr("failed"));
-    else
-    {
-        char buff[30];
-
-        sprintf(buff, "%0.2lf, %0.2lf, %0.2lf", loads[0], loads[1], loads[2]);
-        contentLines[count].append(QString(buff));
-    }
-    detailString += contentLines[count] + "\n";
-    count++;
-
-
-    // memory usage
-    if (getMemStats(totalM, freeM, totalS, freeS))
-    {
-        usedM = totalM - freeM;
-        if (totalM > 0)
-        {
-            contentLines[count] = "   " + QObject::tr("RAM") +
-                                  ": "  + usage_str_mb(totalM, usedM, freeM);
-            detailString += contentLines[count] + "\n";
-            count++;
-        }
-        usedS = totalS - freeS;
-        if (totalS > 0)
-        {
-            contentLines[count] = "   " + QObject::tr("Swap") +
-                                  ": "  + usage_str_mb(totalS, usedS, freeS);
-            detailString += contentLines[count] + "\n";
-            count++;
-        }
-    }
-
-    for (detailLoop = detailBegin; detailLoop < count; detailLoop++)
-        contentDetail[detailLoop] = detailString;
-
-    detailBegin = count;
-    detailString = "";
-
-    if (!isBackend)
-    {
-        contentLines[count] = QObject::tr("MythTV server") + ":";
-        detailString += contentLines[count] + "\n";
-        count++;
-
-        // uptime
-        if (!RemoteGetUptime(uptime))
-            uptime = 0;
-        contentLines[count] = uptimeStr(uptime);
-
-        // weighted average loads
-        contentLines[count].append(".   " + QObject::tr("Load") + ": ");
-        float loads[3];
-        if (RemoteGetLoad(loads))
-        {
-            char buff[30];
-
-            sprintf(buff, "%0.2f, %0.2f, %0.2f", loads[0], loads[1], loads[2]);
-            contentLines[count].append(QString(buff));
-        }
-        else
-            contentLines[count].append(QObject::tr("unknown"));
-
-        detailString += contentLines[count] + "\n";
-        count++;
-
-        // memory usage
-        if (RemoteGetMemStats(totalM, freeM, totalS, freeS))
-        {
-            usedM = totalM - freeM;
-            if (totalM > 0)
-            {
-                contentLines[count] = "   " + QObject::tr("RAM") +
-                                      ": "  + usage_str_mb(totalM, usedM, freeM);
-                detailString += contentLines[count] + "\n";
-                count++;
-            }
-
-            usedS = totalS - freeS;
-            if (totalS > 0)
-            {
-                contentLines[count] = "   " + QObject::tr("Swap") +
-                                      ": "  + usage_str_mb(totalS, usedS, freeS);
-                detailString += contentLines[count] + "\n";
-                count++;
-            }
-        }
-    }
-
-    for (detailLoop = detailBegin; detailLoop < count; detailLoop++)
-        contentDetail[detailLoop] = detailString;
-
-    detailBegin = count;
-    detailString = "";
-
-    // get free disk space
-    QString hostnames;
-    
-    vector<FileSystemInfo> fsInfos = RemoteGetFreeSpace();
-    for (uint i=0; i<fsInfos.size(); i++)
-    {
-        hostnames = QString("\"%1\"").arg(fsInfos[i].hostname);
-        hostnames.replace(QRegExp(" "), "");
-        hostnames.replace(QRegExp(","), "\",\"");
-
-        getActualRecordedBPS(hostnames);
-
-        QStringList list;
-        disk_usage_with_rec_time_kb(list,
-            fsInfos[i].totalSpaceKB, fsInfos[i].usedSpaceKB,
-            fsInfos[i].totalSpaceKB - fsInfos[i].usedSpaceKB,
-            recordingProfilesBPS);
-
-        contentLines[count] = 
-            QObject::tr("Disk usage on %1:").arg(fsInfos[i].hostname);
-        detailString += contentLines[count] + "\n";
-        count++;
-
-        QStringList::iterator it = list.begin();
-        for (;it != list.end(); ++it)
-        {
-            contentLines[count] =  QString("   ") + (*it);
-            detailString += contentLines[count] + "\n";
-            count++;
-        }
-
-        for (detailLoop = detailBegin; detailLoop < count; detailLoop++)
-            contentDetail[detailLoop] = detailString;
-
-        detailBegin = count;
-        detailString = "";
-    }
-
-    contentTotalLines = count;
-    update(ContentRect);
-}
-
-/** \fn StatusBox::doAutoExpireList()
- *  \brief Show list of recordings which may AutoExpire
- */
-void StatusBox::doAutoExpireList()
-{
-    int                   count(0);
-    ProgramInfo*          pginfo;
-    QString               contentLine;
-    QString               detailInfo;
-    QString               staticInfo;
-    long long             totalSize(0);
-    long long             liveTVSize(0);
-    int                   liveTVCount(0);
-
-    contentLines.clear();
-    contentDetail.clear();
-    contentFont.clear();
-    doScroll = true;
-
-    vector<ProgramInfo *>::iterator it;
-    for (it = expList.begin(); it != expList.end(); it++)
-        delete *it;
-    expList.clear();
-
-    RemoteGetAllExpiringRecordings(expList);
-
-    for (it = expList.begin(); it != expList.end(); it++)
-    {
-        pginfo = *it;
-       
-        totalSize += pginfo->filesize;
-        if (pginfo->recgroup == "LiveTV")
-        {
-            liveTVSize += pginfo->filesize;
-            liveTVCount++;
-        }
-    }
-
-    staticInfo = tr("%1 recordings consuming %2 are allowed to expire")
-                    .arg(expList.size()).arg(sm_str(totalSize / 1024)) + "\n";
-
-    if (liveTVCount)
-        staticInfo += tr("%1 of these are LiveTV and consume %2")
-                        .arg(liveTVCount).arg(sm_str(liveTVSize / 1024)) + "\n";
-    else
-        staticInfo += "\n";
-
-    for (it = expList.begin(); it != expList.end(); it++)
-    {
-        pginfo = *it;
-        contentLine = pginfo->recstartts.toString(dateFormat) + " - ";
-
-        if (pginfo->recgroup == "LiveTV")
-            contentLine += "(" + tr("LiveTV") + ") ";
-
-        contentLine += pginfo->title +
-                       " (" + sm_str(pginfo->filesize / 1024) + ")";
-
-        detailInfo = staticInfo;
-        detailInfo += pginfo->recstartts.toString(timeDateFormat) + " - " +
-                      pginfo->recendts.toString(timeDateFormat);
-
-        detailInfo += " (" + sm_str(pginfo->filesize / 1024) + ")";
-
-        if (pginfo->recgroup == "LiveTV")
-            detailInfo += " (" + tr("LiveTV") + ")";
-
-        detailInfo += "\n" + pginfo->title;
-
-        if (pginfo->subtitle != "")
-            detailInfo += " - " + pginfo->subtitle + "";
-
-        contentLines[count] = contentLine;
-        contentDetail[count] = detailInfo;
-        count++;
-    }
-
-    contentTotalLines = count;
-    update(ContentRect);
-}
-
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
diff --git a/abs/core-testing/mythinstall/statusbox.h b/abs/core-testing/mythinstall/statusbox.h
deleted file mode 100755
index dd209ca..0000000
--- a/abs/core-testing/mythinstall/statusbox.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef STATUSBOX_H_
-#define STATUSBOX_H_
-
-#include <qstringlist.h>
-#include "mythwidgets.h"
-#include "mythdialogs.h"
-#include "uitypes.h"
-#include "xmlparse.h"
-#include "programinfo.h"
-
-typedef QMap<QString, unsigned int> recprof2bps_t;
-
-class LayerSet;
-
-class StatusBox : public MythDialog
-{
-    Q_OBJECT
-  public:
-    StatusBox(MythMainWindow *parent, const char *name = 0);
-   ~StatusBox(void);
-
-   bool IsErrored() const { return errored; }
-
-  protected slots:
-
-  protected:
-    void keyPressEvent(QKeyEvent *e);
-    void paintEvent(QPaintEvent *e);
-
-  private:
-    void updateTopBar();
-    void updateSelector();
-    void updateContent();
-    void LoadTheme();
-    void doListingsStatus();
-    void doTunerStatus();
-    void doLogEntries();
-    void doJobQueueStatus();
-    void doMachineStatus();
-    void doAutoExpireList();
-    void clicked();
-    void setHelpText();
-    void getActualRecordedBPS(QString hostnames);
-
-    XMLParse *theme;
-    QDomElement xmldata;
-    QRect TopRect, SelectRect, ContentRect;
-    UITextType *heading, *helptext;
-    UIListType *icon_list, *list_area;
-    LayerSet *selector, *topbar, *content;
-
-    int max_icons;
-
-    bool inContent, doScroll;
-    int contentTotalLines;
-    int contentSize;
-    int contentPos;
-    int contentMid;
-    int min_level;
-    QString dateFormat, timeFormat, timeDateFormat;
-
-    QMap<int, QString> contentLines;
-    QMap<int, QString> contentDetail;
-    QMap<int, QString> contentFont;
-    QMap<int, QString> contentData;
-    recprof2bps_t      recordingProfilesBPS;
-
-    vector<ProgramInfo *> expList;
-
-    MythMainWindow *my_parent;
-
-    bool isBackend;
-    bool errored;
-};
-
-#endif
diff --git a/abs/core-testing/mythinstall/xorgsettings.cpp b/abs/core-testing/mythinstall/xorgsettings.cpp
deleted file mode 100755
index 02fa3ce..0000000
--- a/abs/core-testing/mythinstall/xorgsettings.cpp
+++ /dev/null
@@ -1,686 +0,0 @@
-
-
-//_include <mythcontext.h>
-#include <unistd.h>
-#include <iostream>
-#include <fstream>
-#include <stdio.h>
-#include "settings.h"
-
-#include <string>
-#include <fstream>
-#include <sstream>
-#include <stdexcept>
-#include <vector>
-#include <cassert>
-#include <algorithm>
-#include <tr1/unordered_map>
-
-
-#include <sys/wait.h>   // For WIFEXITED on Mac OS X
-#include <qapplication.h>
-#include "mythcontext.h"
-#include "libmyth/mythdialogs.h"
-#include "mythdbcon.h"
-#include "lcddevice.h"
-#include "tv.h"
-#include "programinfo.h"
-#include "uitypes.h"
-#include "remoteutil.h"
-#include <qdir.h>
-#include <qimage.h>
-#include <stdlib.h>
-#include <cstdlib>
-
-#include "installsettings.h"
-#include "installdialog.h"
-#include "xorgsettings.h"
-#include <qsqldatabase.h>
-#include <qsqlquery.h>
-#include "installsettings.h"
-extern  HostParms hostparm;
-extern DDCinfo ddcinfo;
-// __________________All the Xorg settings______________
-void ReadDDCvalues (void)
-{
-    QString line;
-    QString currentitem;
-     system ("/usr/sbin/ddcprobe > /tmp/ddcinfo");
-    QFile file("/tmp/ddcinfo");
-        if ( file.open(IO_ReadOnly | IO_Translate) )
-        {
-        QTextStream t( &file );        // use a text stream
-        while ( !t.eof() )
-        {
-            line = t.readLine();
-            if  ( line.contains("Timing ranges:") )
-            {
-                currentitem = line.section( "=", 1,1 );
-                ddcinfo.XVrefresh = line.section( "=", 2,2 );
-                ddcinfo.XHsync  = currentitem.section( "," , 0,0 );
-            }
-            else if  ( line.contains (" Dimensions") )
-            {
-                ddcinfo.Displaysize= line.section( ":", 1,1 );
-            };
-        }
-        file.close();
-        }
-};
-
-static HostCheckBox *HostXUseAdvanced()
-{
-    HostCheckBox *gc = new HostCheckBox("HostXUseAdvanced");
-    gc->setLabel(QObject::tr("Advanced xorg configuration"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr("Displays more settings for Xorg"));
-    return gc;
-};
-
-static HostComboBox *HostXgeneric_connection()
-{
-    HostComboBox *gc = new HostComboBox("HostXgenericConnection",false);
-    gc->setLabel(QObject::tr("Connection"));
-    gc->addSelection("VGA");
-    gc->addSelection("DVI");
-    gc->addSelection("TV");
-    gc->addSelection("AUTO");
-    gc->setHelpText(QObject::tr("Video-out"));
-    return gc;
-}
-
-
-static HostCheckBox *HostXIgnoreEDID()
-{
-    HostCheckBox *gc = new HostCheckBox("HostXIgnoreEDID");
-    gc->setLabel(QObject::tr("Ignore data provided by monitor"));
-    gc->setValue(false);
-    gc->setHelpText(QObject::tr(""));
-    return gc;
-};
-
-
-static HostSpinBox *HostXHsyncLow()
-{
-    HostSpinBox *gc = new HostSpinBox("HostXHsyncLow", 1, 200, 1, true);
-    gc->setLabel(QObject::tr("Hsync"));
-    gc->setValue(6);
-    gc->setHelpText(QObject::tr(""  ));
-    return gc;
-}
-static HostSpinBox *HostXHsyncHigh()
-{
-    HostSpinBox *gc = new HostSpinBox("HostXHsyncHigh", 1, 200, 1, true);
-    gc->setLabel(QObject::tr(""));
-    gc->setValue(6);
-    gc->setHelpText(QObject::tr(""  ));
-    return gc;
-}
-
-static HostSpinBox *HostXVrefreshLow()
-{
-    HostSpinBox *gc = new HostSpinBox("HostXVrefreshLow", 1, 200, 1, true);
-    gc->setLabel(QObject::tr("Vrefresh"));
-    gc->setValue(6);
-    gc->setHelpText(QObject::tr(""  ));
-    return gc;
-}
-static HostSpinBox *HostXVrefreshHigh()
-{
-    HostSpinBox *gc = new HostSpinBox("HostXVrefreshHigh", 1, 200, 1, true);
-    gc->setLabel(QObject::tr(""));
-    gc->setValue(6);
-    gc->setHelpText(QObject::tr(""  ));
-    return gc;
-}
-
-static HostComboBox *HostXDisplaysize()
-{
-    HostComboBox *gc = new HostComboBox("HostXdisplaysize",true);
-    gc->setLabel(QObject::tr("Display size"));
-    gc->setHelpText(QObject::tr("Format should be two numbers    320   250" ));
-    gc->addSelection("487 274 _ 1920x1080 at 100dpi  (16:9)");
-    gc->addSelection("325 182 _ 1280x720 at 100dpi  (16:9)");
-    gc->addSelection("325 243 _ 1280x960 at 100dpi (4:3)");
-    gc->addSelection("260 195 _ 1024x768 at 100dpi  (4:3)");
-    gc->addSelection("203 153 _  800x600 at 100dpi  (4:3)");
-    gc->addSelection("162 121 _  640x480 at 100dpi  (4:3)");
-    gc->addSelection("Custom");
-    return gc;
-}
-
-class EDIDprobedinfo : public TransLabelSetting
-{
-public:
-    EDIDprobedinfo()
-    {
-        QString currentitem = "Reported info \n";
-        currentitem.append("Hsync: ");
-        currentitem.append (ddcinfo.XHsync);
-        currentitem.append (" Vrefresh: ");
-        currentitem.append(ddcinfo.XVrefresh );
-        currentitem.append (" Displaysize: ");
-        currentitem.append(ddcinfo.Displaysize);
-        setLabel(currentitem);
-    };
-};
-
-
-void AdvancedXGeneric_modelines::generic_fillselection(QString modelinefile )
-{
-    if ( hostparm.displayshowadvancedX )
-    {
-    QString currentitem;
-    QString cfiletxt;
-    cfiletxt=MV_ROOT;
-    cfiletxt.append("templates/xorg/modeline." );
-    QString currentfile = cfiletxt;
-    currentfile.append(modelinefile);
-    QString line;
-    QRegExp sep( "\""      );
-    QFile file(currentfile);
-        if ( file.open(IO_ReadOnly | IO_Translate) )
-        {
-        QTextStream t( &file );        // use a text stream
-        while ( !t.eof() )
-            {
-            line = t.readLine();
-            if ( line.startsWith("ModeLine"))
-                {
-                currentitem = line.section( sep , 1,1 );
-                if ( modelinefile == "VESA")
-                    HostXadvancedresVESA->addSelection(currentitem);
-                else if ( modelinefile == "ATSC")
-                    HostXadvancedresATSC->addSelection(currentitem);
-                else if ( modelinefile == "DVD")
-                    HostXadvancedresDVD->addSelection(currentitem);
-                else if ( modelinefile == "NTSC")
-                    HostXadvancedresNTSC->addSelection(currentitem);
-                else if ( modelinefile == "Custom")
-                    HostXadvancedresCustom->addSelection(currentitem);
-                }
-            }
-            file.close();
-        }
-    }
-return ;
-
-}
-
-
-class UseEDID:          public TriggeredConfigurationGroup {
-public:
-    UseEDID():
-    TriggeredConfigurationGroup(true,false,true,true,false,false,false,true) {
-        Setting* useedid = HostXIgnoreEDID();
-        addChild(useedid);
-        setTrigger(useedid);
-
-        ConfigurationGroup* XSYNC = new GridConfigurationGroup(2,false);
-            XSYNC->addChild(HostXHsyncLow());
-            XSYNC->addChild(HostXHsyncHigh());
-
-    ConfigurationGroup* XVREFRESH = new GridConfigurationGroup(2,false);
-            XVREFRESH->addChild(HostXVrefreshLow());
-            XVREFRESH->addChild(HostXVrefreshHigh());
-
-
-        ConfigurationGroup* settings = new GridConfigurationGroup(1,false);
-            settings->addChild(new EDIDprobedinfo);
-            settings->addChild( XSYNC);
-            settings->addChild(XVREFRESH);
-            settings->addChild(HostXDisplaysize());
-
-        addTarget("0", new GridConfigurationGroup(1,false));
-        addTarget("1", settings);
-    };
-};
-
-
-EDIDOptions::EDIDOptions()
-{
-    VerticalConfigurationGroup* rec = new VerticalConfigurationGroup(false);
-    rec->setLabel(QObject::tr("Advanced X options"));
-    rec->setUseLabel(false);
-    rec->addChild(new UseEDID);
-    addChild(rec);
-}
-
-
-AdvancedXGeneric_modelines::AdvancedXGeneric_modelines():
-    TriggeredConfigurationGroup(true,false,true,true,true,true,true,true)
-{
-    SetVertical(false);
-    HostXModelineCatagory = new HostComboBox("HostXModelineCatagory");
-    HostXModelineCatagory->setLabel(QObject::tr("Type"));
-    HostXModelineCatagory->addSelection("Auto");
-    HostXModelineCatagory->addSelection("VESA");
-    HostXModelineCatagory->addSelection("ATSC");
-    HostXModelineCatagory->addSelection("DVD");
-    HostXModelineCatagory->addSelection("NTSC");
-    HostXModelineCatagory->addSelection("Custom");
-    //HostXModelineCatagory->addSelection("nVidia Modeline");
-    HostXModelineCatagory->setHelpText(QObject::tr(""));
-
-    HostXadvancedresVESA = new HostComboBox("HostXadvancedresVESA");
-    HostXadvancedresATSC = new HostComboBox("HostXadvancedresATSC");
-    HostXadvancedresDVD = new HostComboBox("HostXadvancedresDVD");
-    HostXadvancedresNTSC = new HostComboBox("HostXadvancedresNTSC");
-    HostXadvancedresCustom= new HostComboBox("HostXadvancedresCustom");
-
-    generic_fillselection("VESA");
-    generic_fillselection("ATSC");
-    generic_fillselection("DVD");
-    generic_fillselection("NTSC");
-    generic_fillselection("Custom");
-
-    addChild(HostXModelineCatagory);
-    setTrigger(HostXModelineCatagory);
-
-    addTarget("VESA", HostXadvancedresVESA);
-    addTarget("ATSC", HostXadvancedresATSC);
-    addTarget("DVD", HostXadvancedresDVD);
-    addTarget("NTSC", HostXadvancedresNTSC);
-    addTarget("Custom",HostXadvancedresCustom);
-    addTarget("Auto", new VerticalConfigurationGroup(false, false));
-
-};
-
-void AdvancedXGeneric_modelines::AdvancedXGeneric_modelines_GatherSettings(void)
-{
-        QString modelinetype = HostXModelineCatagory->getValue();
-        QString tempmodeline = "HostXadvancedres" + modelinetype ;
-        QString modeline;
-        if ( modelinetype == "VESA")
-                    modeline= HostXadvancedresVESA->getValue() ;
-            else if ( modelinetype == "ATSC")
-                    modeline= HostXadvancedresATSC->getValue() ;
-            else if ( modelinetype == "DVD")
-                modeline= HostXadvancedresDVD->getValue();
-            else if ( modelinetype == "NTSC")
-                modeline= HostXadvancedresNTSC->getValue();
-            else if ( modelinetype == "Custom")
-                    modeline= HostXadvancedresCustom->getValue();
-        hostparm.ThisXresadvanced = modelinetype +"_"+modeline;
-    // Jump to final step
-        testXconfiguration();
-}
-
-
-// --------------------------------------------start of nvidia specific  ------------------------------------
-
-
-AdvancedXNvidiaConnections::AdvancedXNvidiaConnections():
-    TriggeredConfigurationGroup(false,false,true,true,true,true,true,true) {
-
-    HostXNvidiaConnection = new HostComboBox("HostXNvidiaConnection",false);
-    HostXNvidiaConnection->setLabel(QObject::tr("Connection"));
-    HostXNvidiaConnection->addSelection("Auto");
-    HostXNvidiaConnection->addSelection("DVI");
-    HostXNvidiaConnection->addSelection("VGA");
-    HostXNvidiaConnection->addSelection("TV");
-    HostXNvidiaConnection->setHelpText(QObject::tr("Video-out"));
-
-    addChild(HostXNvidiaConnection);
-    setTrigger(HostXNvidiaConnection);
-    AdvancedXNvidia_modelines *ADVANCEDXNVIDIA_MODELINES = new AdvancedXNvidia_modelines;
-
-    HostXnVidiaTVstandard =  new HostComboBox("HostXnVidiaTVstandard");
-    HostXnVidiaTVstandard->setLabel(QObject::tr("nVidia-out"));
-    HostXnVidiaTVstandard->addSelection("PAL-B"	);
-    HostXnVidiaTVstandard->addSelection("PAL-D"	);
-    HostXnVidiaTVstandard->addSelection("PAL-G"	);
-    HostXnVidiaTVstandard->addSelection("PAL-H"	);
-    HostXnVidiaTVstandard->addSelection("PAL-I"	);
-    HostXnVidiaTVstandard->addSelection("PAL-K1");
-    HostXnVidiaTVstandard->addSelection("PAL-M"	);
-    HostXnVidiaTVstandard->addSelection("PAL-N"	);
-    HostXnVidiaTVstandard->addSelection("PAL-NC");
-    HostXnVidiaTVstandard->addSelection("NTSC-J");
-    HostXnVidiaTVstandard->addSelection("NTSC-M");
-    HostXnVidiaTVstandard->addSelection("HD480i"	);
-    HostXnVidiaTVstandard->addSelection("HD480p"	);
-    HostXnVidiaTVstandard->addSelection("HD720p"	);
-    HostXnVidiaTVstandard->addSelection("HD1080i"	);
-    HostXnVidiaTVstandard->addSelection("HD1080p");
-    HostXnVidiaTVstandard->addSelection("HD576i"	);
-    HostXnVidiaTVstandard->addSelection("HD576p"	);
-    HostXnVidiaTVstandard->setHelpText(QObject::tr("Indrustry standard resolution to send to the TV"));
-
-    HostXnVidiaTVformat = new  HostComboBox("HostXnVidiaTVformat");
-    HostXnVidiaTVformat->setLabel(QObject::tr("TV-Format(nvidia)"));
-    HostXnVidiaTVformat->addSelection("AUTOSELECT");
-    HostXnVidiaTVformat->addSelection("COMPOSITE");
-    HostXnVidiaTVformat->addSelection("SVIDEO");
-    HostXnVidiaTVformat->addSelection("COMPONENT");
-    HostXnVidiaTVformat->addSelection("SCART");
-    HostXnVidiaTVformat->setHelpText(QObject::tr("Physical connection to the nvidia card"));
-
-    ConfigurationGroup* nvtvout = new VerticalConfigurationGroup(false);
-        nvtvout ->addChild(HostXnVidiaTVformat);
-        nvtvout->addChild(HostXnVidiaTVstandard);
-
-    addTarget("Auto",ADVANCEDXNVIDIA_MODELINES  );
-    addTarget("DVI", ADVANCEDXNVIDIA_MODELINES );
-    addTarget("VGA",ADVANCEDXNVIDIA_MODELINES);
-    addTarget("TV", nvtvout);
-
-    connect(this, SIGNAL(nVidia_sig(void)),
-        ADVANCEDXNVIDIA_MODELINES,   SLOT(AdvancedXNvidia_modelines_GatherSettings()));
-};
-
-
-
-
-void AdvancedXNvidia_modelines::Nvidia_fillselection(QString modelinefile )
-{
-    if ( hostparm.displayshowadvancedX )
-    {
-    QString currentitem;
-    QString cfiletxt;
-    cfiletxt=MV_ROOT;
-    cfiletxt.append("templates/xorg/modeline." );
-    QString currentfile = cfiletxt;
-    currentfile.append(modelinefile);
-    QString line;
-    QRegExp sep( "\""      );
-    QFile file(currentfile);
-        if ( file.open(IO_ReadOnly | IO_Translate) )
-        {
-        QTextStream t( &file );        // use a text stream
-        while ( !t.eof() )
-            {
-            line = t.readLine();
-            if ( line.startsWith("ModeLine"))
-                {
-                currentitem = line.section( sep , 1,1 );
-                if ( modelinefile == "VESA")
-                    HostXNvidiaadvancedresVESA->addSelection(currentitem);
-                else if ( modelinefile == "ATSC")
-                    HostXNvidiaadvancedresATSC->addSelection(currentitem);
-                else if ( modelinefile == "DVD")
-                    HostXNvidiaadvancedresDVD->addSelection(currentitem);
-                else if ( modelinefile == "NTSC")
-                    HostXNvidiaadvancedresNTSC->addSelection(currentitem);
-                else if ( modelinefile == "Custom")
-                    HostXNvidiaadvancedresCustom->addSelection(currentitem);
-                }
-            }
-            file.close();
-        }
-    }
-return ;
-
-}
-
-
-
-AdvancedXNvidia_modelines::AdvancedXNvidia_modelines():
-    TriggeredConfigurationGroup(true,false,true,true,true,true,true,true)
-{
-    SetVertical(true);
-    HostXNvidiaModelineCatagory = new HostComboBox("HostXNvidiaModelineCatagory");
-    HostXNvidiaModelineCatagory->setLabel(QObject::tr("Category"));
-    HostXNvidiaModelineCatagory->addSelection("Auto");
-    HostXNvidiaModelineCatagory->addSelection("VESA");
-    HostXNvidiaModelineCatagory->addSelection("ATSC");
-    HostXNvidiaModelineCatagory->addSelection("DVD");
-    HostXNvidiaModelineCatagory->addSelection("NTSC");
-    HostXNvidiaModelineCatagory->addSelection("Custom");
-    HostXNvidiaModelineCatagory->addSelection("nVidia Modeline");
-    HostXNvidiaModelineCatagory->setHelpText(QObject::tr(""));
-
-    HostXNvidiaadvancedresVESA = new HostComboBox("HostXNvidiaadvancedresVESA");
-    HostXNvidiaadvancedresATSC = new HostComboBox("HostXNvidiaadvancedresATSC");
-    HostXNvidiaadvancedresDVD = new HostComboBox("HostXNvidiaadvancedresDVD");
-    HostXNvidiaadvancedresNTSC = new HostComboBox("HostXNvidiaadvancedresNTSC");
-    HostXNvidiaadvancedresCustom= new HostComboBox("HostXNvidiaadvancedresCustom");
-
-    Nvidia_fillselection("VESA");
-    Nvidia_fillselection("ATSC");
-    Nvidia_fillselection("DVD");
-    Nvidia_fillselection("NTSC");
-    Nvidia_fillselection("Custom");
-
-    HostXnVidia1080p = new HostCheckBox("HostXnVidia1080p");
-    HostXnVidia1080p->setLabel(QObject::tr("1080p"));
-    HostXnVidia1080p->setValue(true);
-    HostXnVidia1080p->setHelpText(QObject::tr(" "));
-
-    HostXnVidia1080i = new HostCheckBox("HostXnVidia1080i");
-    HostXnVidia1080i->setLabel(QObject::tr("1080i"));
-    HostXnVidia1080i->setValue(true);
-    HostXnVidia1080i->setHelpText(QObject::tr(" "));
-
-    HostXnVidia720p = new HostCheckBox("HostXnVidia720p");
-    HostXnVidia720p->setLabel(QObject::tr("720p"));
-    HostXnVidia720p->setValue(true);
-    HostXnVidia720p->setHelpText(QObject::tr(" "));
-
-    HostXnVidia480p = new HostCheckBox("HostXnVidia480p");
-    HostXnVidia480p->setLabel(QObject::tr("480p"));
-    HostXnVidia480p->setValue(true);
-    HostXnVidia480p->setHelpText(QObject::tr(" "));
-
-    ConfigurationGroup* nVidiastandard = new HorizontalConfigurationGroup(false,false,true,true);
-    nVidiastandard ->addChild(HostXnVidia480p);
-    nVidiastandard ->addChild(HostXnVidia720p);
-    nVidiastandard ->addChild(HostXnVidia1080p);
-    nVidiastandard ->addChild(HostXnVidia1080i);
-    nVidiastandard  ->setLabel(QObject::tr("Standard Nvidia Modelines"));
-
-
-    addChild(HostXNvidiaModelineCatagory);
-    setTrigger(HostXNvidiaModelineCatagory);
-
-    addTarget("VESA", HostXNvidiaadvancedresVESA);
-    addTarget("ATSC", HostXNvidiaadvancedresATSC);
-    addTarget("DVD", HostXNvidiaadvancedresDVD);
-    addTarget("NTSC", HostXNvidiaadvancedresNTSC);
-    addTarget("Custom",HostXNvidiaadvancedresCustom);
-    addTarget("nVidia Modeline",nVidiastandard);
-    addTarget("Auto", new VerticalConfigurationGroup(false, false));
-};
-
-
-void AdvancedXNvidiaConnections::AdvancedXNvidiaConnectionsGatherSettings(void)
-{
-    cout << "inside AdvancedXNvidiaConnectionsGatherSettings"  << endl;
-    hostparm.ThisXconnection = HostXNvidiaConnection->getValue();
-    hostparm.ThisXTVstandard = HostXnVidiaTVformat->getValue();
-    hostparm.ThisXTVconnection = HostXnVidiaTVstandard->getValue();
-    emit nVidia_sig();  // jump to AdvancedXNvidia_modelines_GatherSettings
-
-};
-
-
-void AdvancedXNvidia_modelines::AdvancedXNvidia_modelines_GatherSettings(void)
-{
-        QString modelinecatagory = HostXNvidiaModelineCatagory->getValue();
-        QString tempmodeline = "HostXadvancedres" + modelinecatagory ;
-        QString modeline;
-
-        if ( modelinecatagory == "VESA")
-                    modeline= HostXNvidiaadvancedresVESA->getValue() ;
-            else if ( modelinecatagory == "ATSC")
-                    modeline= HostXNvidiaadvancedresATSC->getValue() ;
-            else if ( modelinecatagory == "DVD")
-                modeline= HostXNvidiaadvancedresDVD->getValue();
-            else if ( modelinecatagory == "NTSC")
-                modeline= HostXNvidiaadvancedresNTSC->getValue();
-            else if ( modelinecatagory == "Custom")
-                    modeline= HostXNvidiaadvancedresCustom->getValue();
-            else if ( modelinecatagory == "nVidia Modeline" )
-                    modeline = "Builtin" ;
-            // need to add stuff to find the built in nvidia modelines
-        hostparm.ThisXresadvanced = modelinecatagory +"_"+modeline;
-
-    cout << " in nvidia modeline gather settings" << endl;
-    // Jump to final step
-    testXconfiguration();
-};
-// ----------------------------------------END nvidia specific
-
-
-
-AdvancedXcardtype::AdvancedXcardtype():
-    TriggeredConfigurationGroup(false,false,true,true,true,true,false,false) {
-    HostXcardtype = new HostComboBox("HostXcardtype",false);
-    HostXcardtype->setLabel(QObject::tr("Video card/driver"));
-    HostXcardtype->addSelection("nVidia");
-    HostXcardtype->addSelection("ATI");
-    HostXcardtype->addSelection("VMWARE");
-    HostXcardtype->addSelection("Intel");
-    HostXcardtype->addSelection("Via");
-    HostXcardtype->setHelpText(QObject::tr("nVidia work, ati works,VMWARE works, Intel does not work(yet),  Via is a joke"));
-        addChild(HostXcardtype);
-        setTrigger(HostXcardtype);
-
-    AdvancedXGeneric_modelines *ADVANCEDXGENERICMODELINES = new AdvancedXGeneric_modelines;
-    AdvancedXNvidiaConnections *ADVANCEDXNVIDIACONNECTIONS = new AdvancedXNvidiaConnections;
-
-    addTarget("VMWARE", ADVANCEDXGENERICMODELINES);
-    addTarget("Intel", ADVANCEDXGENERICMODELINES);
-    addTarget("Via", ADVANCEDXGENERICMODELINES);
-
-    addTarget("nVidia",ADVANCEDXNVIDIACONNECTIONS);
-    addTarget("ATI",ADVANCEDXGENERICMODELINES);
-
-    connect(this, SIGNAL(go(void)),
-        ADVANCEDXGENERICMODELINES,   SLOT(AdvancedXGeneric_modelines_GatherSettings()));
-    connect(this, SIGNAL(gonVidia(void)),
-        ADVANCEDXNVIDIACONNECTIONS,   SLOT(AdvancedXNvidiaConnectionsGatherSettings()));
-
-};
-
-void AdvancedXcardtype::AdvancedXcardgatherSettings(void)
-{
-    //called when test button is pressed
-    hostparm.ThisXcardtype =  HostXcardtype->getValue() ;
-    if (hostparm.ThisXcardtype == "nVidia")
-            emit gonVidia();
-    else if (hostparm.ThisXcardtype =="ATI")
-          emit goATI();
-    else
-        emit  go();
-};
-
-
-AdvancedXSettings::AdvancedXSettings():
-    TriggeredConfigurationGroup(true,true,true,true,true,true,true,true) {
-        setLabel(QObject::tr("Advanced X  settings"));
-        Setting* Advancedxsettings = HostXUseAdvanced();
-        addChild(Advancedxsettings);
-        setTrigger(Advancedxsettings);
-    HostXIgnoreConfig = new HostCheckBox("HostXIgnoreConfig");
-    HostXIgnoreConfig->setLabel(QObject::tr("User supplied config. "));
-    HostXIgnoreConfig->setValue(false);
-    #ifdef __MVAPP__
-        HostXIgnoreConfig->setHelpText(QObject::tr("When this is checked, the system will use the configuration file provided by YOU.  Place the file you want to use in /data/home/mythtv/templates/xorg.user."));
-    #else
-        HostXIgnoreConfig->setHelpText(QObject::tr("When this is checked, the system will use the configuration file provided by YOU.  Place the file you want to use in /home/mythtv/templates/xorg.user."));
-    #endif
-    HorizontalConfigurationGroup *lp =
-        new HorizontalConfigurationGroup(false, false, true, true);
-
-    TransButtonSetting *EDIDbutton = new TransButtonSetting();
-    EDIDbutton->setLabel(tr("Display Settings"));
-
-    TransButtonSetting *TestXbutton = new TransButtonSetting();
-    TestXbutton->setLabel(tr("Test X Configuration"));
-        lp->addChild(EDIDbutton);
-        lp->addChild(TestXbutton);
-
-    AdvancedXcardtype *AXCT = new AdvancedXcardtype ;
-
-    ConfigurationGroup* settings = new VerticalConfigurationGroup(false);
-        settings->addChild(AXCT);
-        settings->addChild(lp);
-
-    ConfigurationGroup* setting1 = new GridConfigurationGroup(1,false);
-        setting1->addChild(HostXres());
-        setting1->addChild(HostXIgnoreConfig);
-
-    connect(EDIDbutton, SIGNAL(pressed()), this,   SLOT(ADJUSTEDID()));
-    connect(TestXbutton, SIGNAL(pressed()), AXCT,   SLOT(AdvancedXcardgatherSettings()));
-    addTarget("0",setting1);
-    addTarget("1", settings);
-};
-
-void AdvancedXSettings::ADJUSTEDID(void)
-{
-    EDIDOptions edidscreen;
-    edidscreen.exec();
-}
-
-
-void testXconfiguration(void)
-{
-        hostparm.ThisXIgnoreEDID  =gContext->GetSetting("HostXIgnoreEDID");
-        QString tempstring  ;
-        tempstring = gContext->GetSetting("HostXHsyncLow");
-        tempstring.append(" - ");
-        tempstring.append(gContext->GetSetting("HostXHsyncHigh") );
-        hostparm.ThisXHsync=tempstring;
-
-        tempstring ="";
-        tempstring=gContext->GetSetting("HostXVrefreshLow");
-        tempstring.append(" - ");
-        tempstring.append(gContext->GetSetting("HostXVrefreshHigh"));
-        hostparm.ThisXVrefresh=tempstring;
-        hostparm.ThisXDisplaysize= gContext -> GetSetting("HostXDisplaysize");
-
-//  Assemble the advanced modeline string
-/*
-    QString modelinetype = gContext->GetSetting("HostXModelineCatagory");;
-        QString tempmodeline = "HostXadvancedres" + modelinetype ;
-        QString modeline    = gContext ->GetSetting(tempmodeline);
-        hostparm.ThisXresadvanced = modelinetype +"_"+modeline;
-*/
-/*
-        cout << "start of parm list" << endl;
-        cout << "--------------------"<<endl;
-        cout  <<  hostparm.ThisXcardtype << endl;
-        cout <<   hostparm. ThisXresadvanced<< endl;
-        cout <<   hostparm.ThisXconnection << endl;
-        cout <<   hostparm.ThisXTVstandard << endl;
-        cout <<   hostparm.ThisXTVconnection << endl;
-        cout << hostparm.ThisXIgnoreEDID     << endl;
-        cout << hostparm.ThisXHsync << endl;
-        cout << hostparm.ThisXVrefresh<< endl;
-        cout <<  hostparm.ThisXDisplaysize<< endl;
-*/
-        QString commandline = "xconfig.sh  test  0 ";
-        commandline.append(hostparm.ThisXcardtype);
-        commandline.append(" " );
-        commandline.append(hostparm.ThisXIgnoreEDID );
-        commandline.append(" " );
-        commandline.append(hostparm.ThisXconnection );
-        commandline.append(" \""  );
-        commandline.append(hostparm.ThisXHsync );
-        commandline.append(" \"  " );
-        commandline.append(" \""  );
-        commandline.append(hostparm.ThisXVrefresh);
-        commandline.append(" \"  " );
-        commandline.append(hostparm.ThisXresadvanced );
-        commandline.append(" " );
-        commandline.append(hostparm.ThisXTVconnection );
-        commandline.append(" " );
-        commandline.append(" \""  );
-        commandline.append(hostparm.ThisXDisplaysize);
-        commandline.append(" \"  " );
-        //cout << commandline << endl;
-
-        QString message;
-        message = "Someday this button will do something, but for right now all it does is show this message.";
-        message.append ("\n");
-
-        message.append(commandline);
-        MythPopupBox::showOkPopup(
-            gContext->GetMainWindow(), QObject::tr("Test X button"),
-            message);
-};
-
-
-
-
diff --git a/abs/core-testing/mythinstall/xorgsettings.h b/abs/core-testing/mythinstall/xorgsettings.h
deleted file mode 100755
index 46c4952..0000000
--- a/abs/core-testing/mythinstall/xorgsettings.h
+++ /dev/null
@@ -1,178 +0,0 @@
-#include <settings.h>
-#include "mythdialogs.h"
-#include "libmyth/mythdialogs.h"
-#include "libmyth/mythwidgets.h"
-#include "installsettings.h"
-
-class AdvancedXNvidiaConnections: public TriggeredConfigurationGroup {
-Q_OBJECT
-public:
-    AdvancedXNvidiaConnections();
-    HostComboBox *HostXNvidiaConnection;
-    HostComboBox *HostXnVidiaTVformat;
-    HostComboBox *HostXnVidiaTVstandard;
-
-public slots:
-    void AdvancedXNvidiaConnectionsGatherSettings();
-signals:
-        void nVidia_sig(void);
-};
-
-
-class AdvancedXNvidia_modelines: public TriggeredConfigurationGroup {
-    Q_OBJECT
-public:
-    AdvancedXNvidia_modelines();
-    HostComboBox *HostXNvidiaModelineCatagory;
-    HostComboBox *HostXNvidiaadvancedresVESA;
-    HostComboBox *HostXNvidiaadvancedresATSC;
-    HostComboBox *HostXNvidiaadvancedresDVD;
-    HostComboBox *HostXNvidiaadvancedresNTSC;
-    HostComboBox *HostXNvidiaadvancedresCustom;
-    HostCheckBox *HostXnVidia1080p;
-    HostCheckBox *HostXnVidia1080i;
-    HostCheckBox *HostXnVidia720p;
-    HostCheckBox *HostXnVidia480p;
-    void Nvidia_fillselection(QString);
-public slots:
-    void AdvancedXNvidia_modelines_GatherSettings(void);
-};
-
-
-//-------------------------------------------------
-
-class AdvancedXcardtype: public TriggeredConfigurationGroup {
-Q_OBJECT
-public:
-    AdvancedXcardtype();
-    HostComboBox *HostXcardtype;
-
-public slots:
-    void AdvancedXcardgatherSettings();
-signals:
-        void go(void );
-        void goATI(void);
-        void gonVidia(void);
-};
-
-
-class AdvancedXSettings:    public TriggeredConfigurationGroup {
-Q_OBJECT
-public:
-    AdvancedXSettings();
-    HostCheckBox *HostXIgnoreConfig;
-protected slots:
-    void ADJUSTEDID(void);
-};
-
-
-class AdvancedXGeneric_modelines: public TriggeredConfigurationGroup {
-    Q_OBJECT
-public:
-    AdvancedXGeneric_modelines();
-    HostComboBox *HostXModelineCatagory;
-    HostComboBox *HostXadvancedresVESA;
-    HostComboBox *HostXadvancedresATSC;
-    HostComboBox *HostXadvancedresDVD;
-    HostComboBox *HostXadvancedresNTSC;
-    HostComboBox *HostXadvancedresCustom;
-    void generic_fillselection(QString);
-public slots:
-    void AdvancedXGeneric_modelines_GatherSettings(void);
-};
-
-
-class EDIDOptions : public ConfigurationWizard
-{
-public:
-    EDIDOptions();
-};
-
-
-
-
-
-
-
-
-void testXconfiguration();
-void ReadDDCvalues();
-static HostComboBox *HostXres()
-//Used in the simple config
-{
-    HostComboBox *gc = new HostComboBox("HostXres");
-    gc->setLabel(QObject::tr("Initial resolution"));
-    const int num_defaults = 2;
-    char *defaults[num_defaults]={"800x600","1280x720"};
-    int defaults_added[num_defaults]={0,0};
-    int found_modes_in_xorg_log = FALSE;
-
-    gc->addSelection("Auto");
-
-    {
-      FILE *modelines;
-      const char*mode_extract_command =
-        "sed -n 's/[[:space:]]\\+/ /g;"             // compress whitespace
-                "s/[\\) ]: /#/g;"              // Insert # as a field delimiter
-		"/Modes in ModePool/,/ModePool/p'" // get the Modelool lines
-		" /var/log/Xorg.0.log |"             // from the Xorg log
-	"cut -d# -f2-3 | "            // select the mode and description fields
-	"sed '/^\\\"/!d;"             // Only selest modeline lines.
-	     "/DoubleScan/d;"         // Remove doublescan modelines.
-	     "/nvidia-auto-select/d;" // Remove auto modeline.
-             "s/ x /x/g;"
-	     "s/ @ /@/g;"
-             "s/From: //g;"
-             "s/ Format [0-9]*) (/, /g;"
-             "s/ Format [0-9]*//g;"
-	     "s/ Server//g'"; //reformat. 
-      cout << mode_extract_command << endl;
-      modelines = popen (mode_extract_command, "r");
-
-      char previous_mode[200]={0};
-
-      if (modelines)
-      {
-	char line_in[200];
-	while (fgets (line_in, sizeof (line_in), modelines))
-	{
-          char *separator;
-
-	  if (strchr (line_in, '\n'))
-	    strchr (line_in, '\n')[0]=0;
-
-	  separator = strchr (line_in, '#');
-
-	  if (separator)
-	  {
-	    separator[0]=0;
-	    separator++;
-
-  	    // Skip this mode if the description is identical to the previous.
-	    if (strcmp (previous_mode, separator) == 0)
-	      continue;
-
-	    strncpy (previous_mode, separator, sizeof(previous_mode));
-  	    gc->addSelection(separator, line_in);
-	    found_modes_in_xorg_log = TRUE;
-
- 	    for (int def = 0; def < num_defaults; def++)
-	      if (strncmp (&line_in[1], defaults[def], strlen (defaults[def]))==0)
-	        defaults_added[def]=1;
-	  }
-	}
-	pclose (modelines);
-      }
-    }
-
-    for (int def = 0; def < num_defaults; def++)
-      if (!defaults_added[def])
-	gc->addSelection(defaults[def], defaults[def]);
-
-    if (found_modes_in_xorg_log)
-      gc->setHelpText(QObject::tr("Choose a resolution to match your display and a refresh rate to match the content you will be recording - 60 Hz for NTSC (e.g. US) 50 Hz for PAL (e.g. UK, Aust, NZ)."));
-    else
-      gc->setHelpText(QObject::tr("Choose the resolution to use when the system reboots."));
-
-    return gc;
-}
diff --git a/abs/core-testing/mythtv/stable-0.22/morethemes/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/morethemes/PKGBUILD
index e311328..71c39fb 100644
--- a/abs/core-testing/mythtv/stable-0.22/morethemes/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/morethemes/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=morethemes
 pkgver=0.22
-pkgrel=22002
+pkgrel=22005
 pkgdesc="Additional themes for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/themes
-_svnver=23110
+_svnver=23247
 _svnmod=themes
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mp_all.sh b/abs/core-testing/mythtv/stable-0.22/mp_all.sh
index 73ff907..e82f443 100755
--- a/abs/core-testing/mythtv/stable-0.22/mp_all.sh
+++ b/abs/core-testing/mythtv/stable-0.22/mp_all.sh
@@ -2,8 +2,8 @@
 
 # for 0.22, we are starting the release numbers at 22000
 # and incrementing from there every time we build
-pkgrel=22002
-_svnver=23110
+pkgrel=22005
+_svnver=23247
 
 # NOTE: Make sure to build and install mythtv first BEFORE building anything else
 buildlist=('mythtv' 'mytharchive' 'mythbrowser' 'mythflix' 'mythgallery' 'mythgame' 'mythmovies' 'mythmusic' 'mythnews' 'mythvideo' 'mythweather' 'mythzoneminder' 'mythweb' 'myththemes' 'morethemes')
diff --git a/abs/core-testing/mythtv/stable-0.22/mytharchive/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mytharchive/PKGBUILD
index 5fded41..27c51fc 100644
--- a/abs/core-testing/mythtv/stable-0.22/mytharchive/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mytharchive/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mytharchive
 pkgver=0.22
-pkgrel=22002
+pkgrel=22005
 pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows."
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=23110
+_svnver=23247
 _svnmod=mythplugins
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythbrowser/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythbrowser/PKGBUILD
index 503abc6..1116253 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythbrowser/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythbrowser/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythbrowser
 pkgver=0.22
-pkgrel=22002
+pkgrel=22005
 pkgdesc="Mini web browser for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=23110
+_svnver=23247
 _svnmod=mythplugins
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythflix/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythflix/PKGBUILD
index cc220a4..b0953ea 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythflix/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythflix/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythflix
 pkgver=0.22
-pkgrel=22002
+pkgrel=22005
 pkgdesc="Netflix access plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=23110
+_svnver=23247
 _svnmod=mythplugins
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythgallery/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythgallery/PKGBUILD
index ff2b182..7e30499 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythgallery/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythgallery/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythgallery
 pkgver=0.22
-pkgrel=22002
+pkgrel=22005
 pkgdesc="Image gallery plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=23110
+_svnver=23247
 _svnmod=mythplugins
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythgame/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythgame/PKGBUILD
index 3cdc1c3..bd47967 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythgame/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythgame/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythgame
 pkgver=0.22
-pkgrel=22002
+pkgrel=22005
 pkgdesc="Emulation plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=23110
+_svnver=23247
 _svnmod=mythplugins
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythmovies/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythmovies/PKGBUILD
index 1cca902..94805ac 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythmovies/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythmovies/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythmovies
 pkgver=0.22
-pkgrel=22002
+pkgrel=22005
 pkgdesc="Displays information about movies playing in the area."
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=23110
+_svnver=23247
 _svnmod=mythplugins
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythmusic/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythmusic/PKGBUILD
index b55a80b..9d5ebcc 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythmusic/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythmusic/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythmusic
 pkgver=0.22
-pkgrel=22002
+pkgrel=22005
 pkgdesc="Music playing plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -16,7 +16,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=23110
+_svnver=23247
 _svnmod=mythplugins
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythnews/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythnews/PKGBUILD
index 4004ef4..824bbd9 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythnews/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythnews/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythnews
 pkgver=0.22
-pkgrel=22002
+pkgrel=22005
 pkgdesc="News checking plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=23110
+_svnver=23247
 _svnmod=mythplugins
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/myththemes/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/myththemes/PKGBUILD
index 8dd8c91..357154e 100755
--- a/abs/core-testing/mythtv/stable-0.22/myththemes/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/myththemes/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=myththemes
 pkgver=0.22
-pkgrel=22002
+pkgrel=22005
 pkgdesc="Themes for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/myththemes
-_svnver=23110
+_svnver=23247
 _svnmod=myththemes
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythtv/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythtv/PKGBUILD
index f3d535f..b671f8e 100755
--- a/abs/core-testing/mythtv/stable-0.22/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv
 pkgver=0.22
-pkgrel=22002
+pkgrel=22005
 pkgdesc="A personal video recorder for Linux"
 url="http://www.mythtv.org"
 license="GPL"
@@ -23,7 +23,7 @@ arch=('i686' 'x86_64')
 #md5sums=()
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythtv
-_svnver=23110
+_svnver=23247
 _svnmod=mythtv
 
 build() {
diff --git a/abs/core-testing/mythtv/stable-0.22/mythvideo/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythvideo/PKGBUILD
index 9eb82a2..b5e18ac 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythvideo/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythvideo/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythvideo
 pkgver=0.22
-pkgrel=22002
+pkgrel=22005
 pkgdesc="Video playback and browsing plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=23110
+_svnver=23247
 _svnmod=mythplugins
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythweather/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythweather/PKGBUILD
index a0815af..7321259 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythweather/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythweather/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythweather
 pkgver=0.22
-pkgrel=22002
+pkgrel=22005
 pkgdesc="Weather checking plugin for MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=23110
+_svnver=23247
 _svnmod=mythplugins
 
 
diff --git a/abs/core-testing/mythtv/stable-0.22/mythweb/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythweb/PKGBUILD
index 92a782e..3e91cde 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythweb/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythweb/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythweb
 pkgver=0.22
-pkgrel=22002
+pkgrel=22005
 pkgdesc="Web interface for MythTV's backend"
 url="http://www.mythtv.org"
 license="GPL"
@@ -15,7 +15,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=23110
+_svnver=23247
 _svnmod=mythplugins
 
 DOCROOT=/data/srv/httpd/htdocs/mythweb
diff --git a/abs/core-testing/mythtv/stable-0.22/mythzoneminder/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythzoneminder/PKGBUILD
index f141e11..b800708 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythzoneminder/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythzoneminder/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythzoneminder
 pkgver=0.22
-pkgrel=22002
+pkgrel=22005
 pkgdesc="Integrates ZoneMinder into MythTV"
 url="http://www.mythtv.org"
 license="GPL"
@@ -14,7 +14,7 @@ patches=()
 source=(`echo ${patches[@]:0}`)
 
 _svntrunk=http://cvs.mythtv.org/svn/branches/release-0-22-fixes/mythplugins
-_svnver=23110
+_svnver=23247
 _svnmod=mythplugins
 
 
-- 
cgit v0.12

