Removed old core and extra from repo. Renamed -testing to core/extra. This will setup the base for the testing branch.

7 files changed, 0 insertions, 848 deletions

diff --git a/abs/core-testing/LinHES-system/bin/backupcommon b/abs/core-testing/LinHES-system/bin/backupcommon
deleted file mode 100644
index d112341..0000000
--- a/abs/core-testing/LinHES-system/bin/backupcommon
+++ /dev/null
@@ -1,382 +0,0 @@
-#!/bin/bash
-
-. /usr/LH/bin/library.sh || {
-    echo 1>&2 "Can not load common library!"
-    exit 1
-}
-
-# You need to be root at least via sudo for the backup utilities to work.
-must_be_root
-
-#----------------------------------------------------------------------------
-DATABASE="mythconverg"
-DATABASE_DIR="/data/srv/mysql/$DATABASE"
-BACKUP_LIST="./root ./home ./etc
-             ./var/lib/alsa/asound.state"
-RESTORE_LIST="./root ./home ./etc/mythtv/modules ./etc/lirc
-              ./etc/X11/xorg.conf ./etc/asound.conf ./etc/default/aumix
-              ./var/lib/alsa/asound.state ./etc/mplayer/mplayer.conf
-              ./etc/localtime ./etc/timezone ./etc/asound.state"
-# Both BLACK_LIST and IGNORE_LIST need to have only one file per line
-# They also can't have any extra whitespace...
-# Files and directories we should refuse to restore
-BLACK_LIST='./etc/fstab
-./etc/modules
-./proc
-./dev
-./lib
-./var/lib
-./myth
-./myth/backup
-./home/mythtv/.my.cnf
-./root/.my.cnf
-./home/mythtv/.Xauthority
-./root/.Xauthority'
-# Files we ignore as differences
-IGNORE_LIST='./home/mythtv/.upgrade
-./home/mythtv/.configure
-./home/mythtv/.newcard
-./home/mythtv/.xscreensaver
-./home/mythtv/appletrailer.xml
-./root/ati-driver-installer-8-01-x86.x86_64.run
-./root/ati-driver-installer-8-3-x86.x86_64.run
-./root/mythstreamweb.tar
-./home/mythtv/.Xauthority
-./root/.Xauthority'
-BACKUP_DIR="/myth/backup"
-BACKUP_EXTRAS="$BACKUP_DIR/backup.list"
-RESTORE_EXTRAS="$BACKUP_DIR/restore.list"
-BACKUP_TAR="$BACKUP_DIR/savedfiles.tar"
-BACKUP_SQL="$BACKUP_DIR/$DATABASE.sql"
-#DROP_SQL="/usr/local/share/knoppmyth/drop.sql"
-UTIL_DIR="/usr/LH/bin"
-# Do we really still need to update from myth-0.11 to myth-0.12 ?
-UPDATE_SQL="/usr/share/mythtv/sql/0.11-to-0.12.sql"
-UPDATE_FILES="$UTIL_DIR/restore_fixups.sh"
-COMPRESSION=".gz"
-SOUNDS="/usr/share/sounds"
-SILENCE="$SOUNDS/half_second_of_silence.wav"
-PLAYER="/usr/bin/aplay"
-#----------------------------------------------------------------------------
-AWK=/bin/awk
-BASH=/bin/bash
-BUNZIP2=/bin/bunzip2
-BZIP2=/bin/bzip2
-CAT=/bin/cat
-CHMOD=/bin/chmod
-CHOWN=/bin/chown
-EGREP=/bin/egrep
-GREP=/bin/grep
-GUNZIP=/bin/gunzip
-GZIP=/bin/gzip
-LS=/bin/ls
-MV=/bin/mv
-RM=/bin/rm
-SED=/bin/sed
-TAR=/bin/tar
-TR=/bin/tr
-DIFF=/usr/bin/diff
-FIND=/usr/bin/find
-MD5SUM=/usr/bin/md5sum
-MYISAMCHK=/usr/bin/myisamchk
-MYSQL=/usr/bin/mysql
-MYSQLADMIN=/usr/bin/mysqladmin
-MYSQLDUMP=/usr/bin/mysqldump
-MYTHSHUTDOWN=/usr/bin/mythshutdown
-SORT=/usr/bin/sort
-WC=/usr/bin/wc
-SV=/sbin/sv
-
-#----------------------------------------------------------------------------
-
-require file+r+x $AWK $BASH $BUNZIP2 $BZIP2 $CAT $CHMOD $CHOWN $EGREP $GREP \
-                 $GUNZIP $GZIP $LS $MV $RM $SED $TAR $TR $DIFF $FIND $MD5SUM \
-                 $MYISAMCHK $MYSQL $MYSQLADMIN $MYSQLDUMP $MYTHSHUTDOWN \
-                 $SORT $WC $SV
-
-#require file+r "$DROP_SQL"
-
-require dir+r+w+x /tmp "$BACKUP_DIR" "$DATABASE_DIR"
-
-play_sound () {
-    ($PLAYER $SILENCE $SOUNDS/$1 >& /dev/null)&
-}
-
-# Filter against an exclude list like the black list or the ignore list above
-filter_list () {
-    $GREP -vxF "$*" |
-    $SORT -u
-}
-
-# Some people just can't read or follow directions... :-/
-# This should track the directory names in the default backup list above
-# We also use this to short circuit a certain incredibly dumb stunt
-filter_redundant () {
-    filter_list "$($TR -s ' ' '\n' <<<"$BACKUP_LIST ./myth")" |
-    $EGREP -v '^\./(root|home|etc|myth)/' |
-    $SORT -u
-}
-
-get_extras () {
-    # One entry per line, and normalize the prefix
-    $TR ' ' '\n' <"$1" |
-    $AWK '/^$/ {next}
-          /^\.\// {print $0 ; next}
-          /^\// {print "." $0 ; next}
-          { print "./" $0}'
-}
-
-[ -f "$BACKUP_EXTRAS" ] &&
-    BACKUP_LIST="$BACKUP_LIST $(get_extras $BACKUP_EXTRAS |
-                                filter_redundant)"
-
-[ -f "$RESTORE_EXTRAS" ] &&
-    RESTORE_LIST="$RESTORE_LIST $(get_extras $RESTORE_EXTRAS |
-                                  filter_list "$BLACK_LIST")"
-
-# Build tar exclusion parameters out of $BLACK_LIST
-EXCLUSION=""
-case $0 in
-*restore)
-    for file in $BLACK_LIST ; do
-        EXCLUSION="$EXCLUSION --exclude $file "
-    done
-    ;;
-*)
-    ;;
-esac
-
-shrink () {
-    case "$COMPRESSION" in
-    .gz)
-        $GZIP -9 "$@"
-        ;;
-    .bz2)
-        $BZIP2 -9 "$@"
-        ;;
-    *)
-        ;;
-    esac
-}
-
-expand () {
-    case "$*" in
-    *.gz)
-        $GUNZIP "$@"
-        ;;
-    *.bz2)
-        $BUNZIP2 "$@"
-        ;;
-    -c\ *)
-        $CAT $2 /dev/null
-        ;;
-    -t\ *)
-        return 0
-        ;;
-    *)
-        echo 1>&2 "Error, unknown file type!"
-        return 1
-        ;;
-    esac
-}
-
-single_format () {
-    candidates=$($LS -1 "$1.gz" "$1.bz2" "$1" 2>/dev/null)
-    case $($WC -l <<<"$candidates") in
-    1)  return 0  # One is good!
-    	;;
-    0)  echo "Error, no $1 found!"
-    	return 1
-        ;;
-    *)  echo "Warning, multiple formats for $1 found!"
-    	echo "Candidates are: $candidates"
-        ;;
-    esac
-}
-
-compression_type () {
-    for compression in .gz .bz2 "" ; do
-        if [ -f "$1$compression" ] ; then
-            echo "$compression"
-            return 0
-        fi
-    done
-    return 1
-}
-
-backup_roller () { # Gets the rollover sequence to use.
-    prev_i=$1 ; shift
-    for i in "$@" ; do
-        for c in .gz .bz2 "" ; do
-            for f in $BACKUP_SQL $BACKUP_TAR ; do
-                $RM -f $f$c$prev_i
-                if [ -f "$f$c$i" ] ; then
-                    echo "Moving $f$c$i to $f$c$prev_i"
-                    $MV -f $f$c$i $f$c$prev_i
-                fi
-            done
-        done
-        prev_i="$i"
-    done
-}
-
-# Given "subset A B" return true if is A a subset of B
-subset () {
-    cnt=$($DIFF $1 $2 | $GREP '^<' | $WC -l)
-    [ "$cnt" -eq 0 ] && return 0
-    $DIFF $1 $2
-}
-
-mysql_cmd () {
-    $MYSQL -u root $DATABASE -sBe "$*"
-}
-
-mysql_stdin () {
-    $MYSQL -u root $DATABASE -sB
-}
-
-check_files () {
-    OBJECT_LIST="$*"
-    LIVE_FILES=/tmp/live_files_$$
-    SAVED_FILES=/tmp/saved_files_$$
-
-    echo "Checking for the existance of the backup tar file..."
-    single_format "$BACKUP_TAR"
-    c=$(compression_type "$BACKUP_TAR") ||
-        { echo "Error, missing tar file - '$BACKUP_TAR$c'." ; return 1 ; }
-    echo "Using file $BACKUP_TAR$c"
-    echo "Backup tar file exists. Checking the compression..."
-    expand -t $BACKUP_TAR$c ||
-        { echo "Error, bad compressed tarball - '$BACKUP_TAR$c'." ; return 1 ; }
-    echo "Compression looks OK. Checking backup tar file contents..."
-
-    echo "Generating a list of the backup contents..."
-    {
-    expand -c $BACKUP_TAR$c |
-      $TAR tf - $OBJECT_LIST $EXCLUSION |
-      $SED '/\/$/s///' |
-      filter_list "$IGNORE_LIST" >$SAVED_FILES
-    } 2>&1 | $SED -e '/Error exit delayed from previous errors/d'
-
-    echo "Generating a list of the directory contents..."
-    cd /
-    $FIND $OBJECT_LIST \( -type d -or -type f -or -type l \) -print |
-      filter_list "$IGNORE_LIST" >$LIVE_FILES
-
-    echo "Comparing directory versus backup contents..."
-    case $0 in
-    *backup) # backup must contain everything selected from the directories
-        subset $LIVE_FILES $SAVED_FILES
-        ;;
-    *restore) # directories must contain everything selected from the backup
-        subset $SAVED_FILES $LIVE_FILES
-        ;;
-    *)
-        $DIFF $LIVE_FILES $SAVED_FILES
-        ;;
-    esac
-    FILE_STATUS=$?
-    $RM $LIVE_FILES $SAVED_FILES
-    if [ $FILE_STATUS -eq 0 ] ; then
-        echo "Live and saved file lists match."
-    else
-        echo "Warning, file lists are not identical!"
-    fi
-    return $FILE_STATUS
-}
-
-has_records () {
-    filename="$1"
-    description="$2"
-    if [ $($WC -l < "$filename") -eq 0 ] ; then
-        echo "Warning, could not get record counts from $description!"
-        return 1
-    fi
-    if [ $($AWK '{cnt+=$2} END {print cnt}' < "$filename") -eq 0 ] ; then
-        echo "Warning, total record count from $description is zero!"
-        return 1
-    fi
-    return 0
-}
-
-check_tables () {
-    LIVE_TABLES=/tmp/live_tables_$$
-    SAVED_TABLES=/tmp/saved_tables_$$
-
-    echo "Checking for the existance of the DB dump file..."
-    single_format "$BACKUP_SQL"
-    c=$(compression_type "$BACKUP_SQL") ||
-        { echo "Error, missing DB dump - '$BACKUP_SQL$c'" ; return 1 ; }
-    echo "Using file $BACKUP_SQL$c"
-    echo "DB dump file exists. Checking the compression..."
-    expand -t $BACKUP_SQL$c ||
-        { echo "Error, bad compressed DB dump - '$BACKUP_SQL$c'." ; return 1 ; }
-    echo "Compression looks OK. Checking DB dump contents..."
-
-    echo "Generating a list of tables and record counts in the DB dump..."
-    expand -c "$BACKUP_SQL$c" |
-      $AWK '/CREATE TABLE/ { tbl = $3; gsub("`","",tbl); records[tbl] = 0; } \
-        /INSERT INTO/  { tbl = $3; gsub("`","",tbl); \
-                         n = split(substr($0,index($0,"VALUES (")+7),vals,"\\),\\("); \
-                         records[tbl] += n; } \
-        END { for (tbl in records) print tbl, records[tbl]; }' |
-      $SED 's/mythlog [0-9]*/mythlog 0/' |
-      $SORT >$SAVED_TABLES
-    has_records "$SAVED_TABLES" "DB dump" || return 1
-
-    echo "Generating a list of tables and record counts in the live DB..."
-    for tbl in $(mysql_cmd "show tables") ; do
-        mysql_cmd "select '$tbl', count(*) from $tbl"
-    done |
-      $TR -s '\t' ' ' |
-      $SED 's/mythlog [0-9]*/mythlog 0/' |
-      $SORT >$LIVE_TABLES
-    has_records "$LIVE_TABLES" "live DB" || return 1
-
-    echo "Comparing live versus saved tables..."
-    case $0 in
-    *restore) # database must include everything from the backup
-        subset $SAVED_TABLES $LIVE_TABLES
-        ;;
-    *)        # backup must exactly match the database
-        $DIFF $LIVE_TABLES $SAVED_TABLES
-        ;;
-    esac
-    TABLE_STATUS=$?
-    $RM $LIVE_TABLES $SAVED_TABLES
-    if [ $TABLE_STATUS -eq 0 ] ; then
-        echo "Live and saved table lists match."
-    else
-        echo "Warning, table lists are not identical!"
-    fi
-    return $TABLE_STATUS
-}
-
-check_files_and_tables () {
-    STATUS=0
-    echo
-    check_files "$@" || STATUS=1
-    echo
-    check_tables || STATUS=1
-    echo
-    return $STATUS
-}
-
-stop_mysqld () { $SV stop mysql ; }
-start_mysqld () {
-    $SV start mysql
-    for t in 1 2 4 8 ; do
-        ready=$(mysql_cmd 'select 1 from dual' 2>/dev/null)
-        [ "$ready" = "1" ] && break
-        sleep "$t"
-    done
-    [ "$ready" != "1" ] && echo "Error, DB not available after 15 seconds!"
-}
-
-stop_mythbackend () { $SV stop mythbackend ; }
-start_mythbackend () { $SV start mythbackend ; }
-
-lock_myth () { $MYTHSHUTDOWN --lock ; }
-unlock_myth () { $MYTHSHUTDOWN --unlock ; }
-
-true # Make sure that this shows success
diff --git a/abs/core-testing/LinHES-system/bin/checkbackup b/abs/core-testing/LinHES-system/bin/checkbackup
deleted file mode 100755
index b6d8587..0000000
--- a/abs/core-testing/LinHES-system/bin/checkbackup
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-#----------------------------------------------------------------------------
-. /usr/LH/bin/backupcommon || {
-    echo 1>&2 "Can not load common settings!"
-    exit 1
-}
-#----------------------------------------------------------------------------
-
-if check_files_and_tables $BACKUP_LIST  ; then
-    echo "Backup passes all checks."
-    exit 0
-else
-    echo "The backup is bad or already out of date!"
-    exit 1
-fi
diff --git a/abs/core-testing/LinHES-system/bin/checkrestore b/abs/core-testing/LinHES-system/bin/checkrestore
deleted file mode 100755
index ef0360c..0000000
--- a/abs/core-testing/LinHES-system/bin/checkrestore
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-#----------------------------------------------------------------------------
-. /usr/LH/bin/backupcommon || {
-    echo 1>&2 "Can not load common settings!"
-    exit 1
-}
-#----------------------------------------------------------------------------
-
-if check_files_and_tables $RESTORE_LIST ; then
-    echo "Restore passes all checks."
-    exit 0
-else
-    echo "The restore failed or was already modified!"
-    exit 1
-fi
diff --git a/abs/core-testing/LinHES-system/bin/library.sh b/abs/core-testing/LinHES-system/bin/library.sh
deleted file mode 100755
index 2049de3..0000000
--- a/abs/core-testing/LinHES-system/bin/library.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-msg () {  # A status reporting function
-    [ "${VERBOSE:-0}" -gt 0 ] && echo "$*"
-}
-
-error () { # An error reporting function
-    echo 1>&2 "$*"
-}
-
-fatal () { # Report an error and exit with a failure code
-    error "$*"
-    exit 1
-}
-
-# The only non builtin this uses is tr...
-require () { # Check prerequisites
-    e=0
-    props="$1" ; shift
-    for obj in "$@" ; do
-        [ -z "$obj" ] && continue # Too late to do anything itelligent...
-        problems=""
-        for prop in $(/bin/tr '+,' ' ' <<<"$props") ; do
-            case "$prop" in
-            e|exists) # kind of useless...
-                [ -e "$obj" ] || problems="$problems, does not exist" ;;
-            f|file)
-                [ -f "$obj" ] || problems="$problems, is not a file" ;;
-            d|dir)
-                [ -d "$obj" ] || problems="$problems, is not a directory" ;;
-            l|symlink)
-                [ -L "$obj" ] || problems="$problems, is not a symlink" ;;
-            nosymlink)
-                [ -L "$obj" ] && problems="$problems, is a symlink" ;;
-            r|readable)
-                [ -r "$obj" ] || problems="$problems, is not readable" ;;
-            w|writable)
-                [ -w "$obj" ] || problems="$problems, is not writable" ;;
-            x|executable)
-                [ -x "$obj" ] || problems="$problems, is not executable" ;;
-            *)
-                fatal "Programmer error, unknown property: '$prop'" ;;
-            esac
-        done
-        if [ -n "$problems" ] ; then
-            error "Error: '$obj'$problems."
-            e=1
-        fi
-    done
-    [ "$e" -ne 0 ] && fatal "Errors noted above are fatal."
-}
-
-require file+r+x /bin/bash /bin/grep /bin/rm /bin/tr \
-                 /usr/bin/basename /usr/bin/env \
-                 /usr/bin/mysql /usr/bin/sort
-
-if [ -n "$DEBUG" ] ; then
-    for debug_opt in $(/bin/tr ',' ' ' <<<"$DEBUG") ; do
-        echo '============================================================'
-        echo "==== $debug_opt"
-
-        # Note that the order you specifiy these debug options in matters.
-        # I recommend always listing log first. For example:
-        #   export DEBUG=log,env,set,trace
-        case "$debug_opt" in
-        env)    /usr/bin/env | /usr/bin/sort ;;
-        set)    set ;;
-        trace)  set -vx ;;
-        log)    logfile="/tmp/$(/usr/bin/basename $0).$$.debug"
-                /bin/rm -f "$logfile" # Try to avoid privilege escalation bugs
-                echo "Redirecting stdout and stderr to '$logfile'"
-                exec >"$logfile" 2>&1 ;;
-        *)      error "Unknown debug option '$debug_opt'" ;;
-        esac
-    done
-    echo '============================================================'
-fi
-
-must_be_root () { # For things which must be run as root
-    [ $(/usr/bin/id -u) -ne 0 ] && fatal "You must run this script as root!"
-}
-
-must_be_mythtv () { # For things which must be run as mythtv (su if possible)
-    case $(/usr/bin/id -nu) in
-    mythtv) ;; # Continue
-    root)   /bin/su - mythtv -c "$0 $*" ; exit $? ;;
-    *)      fatal "You must run this script at mythtv or root!" ;;
-    esac
-}
-
-# Use a variable so you can override it.
-DATABASE="mythconverg"
-
-mysql_cmd () { # Execute SQL from the command line
-    /usr/bin/mysql -u root "$DATABASE" -sBe "$*"
-}
-
-mysql_stdin () { # Execute SQL from stdin
-    /usr/bin/mysql -u root "$DATABASE" -sB
-}
-
-machine_clause () { # Helper function 
-    if [ -z "$1" ] ; then
-        echo "(hostname = '' or hostname is null)"
-    else
-        echo "hostname = '$1'"
-    fi
-}
-
-get_all_setting_names () { # List setting names
-    case "$#" in
-    0) MACHINE_CLAUSE="" ;;
-    1) MACHINE_CLAUSE="where $(machine_clause "$1")" ;;
-    *) fatal "Programmer error, get_all_names must be passed 0 or 1 args, got $#" ;;
-    esac
-    mysql_cmd "select distinct value from settings $MACHINE_CLAUSE order by value"
-}
-
-get_all_setting_values () { # List settings
-    case "$#" in
-    0) MACHINE_CLAUSE="" ;;
-    1) MACHINE_CLAUSE="where $(machine_clause "$1")" ;;
-    *) fatal "Programmer error, get_all_values must be passed 0 or 1 args, got $#" ;;
-    esac
-    mysql_cmd "select value, data, hostname from settings $MACHINE_CLAUSE order by hostname, value, data"
-}
-
-get_setting_value () { # Get the data for a setting (may return multiples!)
-    case "$#" in
-    1) MACHINE_CLAUSE="" ;;
-    2) MACHINE_CLAUSE="and $(machine_clause "$2")" ;;
-    *) fatal "Programmer error, get_value must be passed 1 or 2 args, got $#" ;;
-    esac
-    mysql_cmd "select data from settings where value = '$1' $MACHINE_CLAUSE"
-}
-
-set_setting_value () { # Insert or update aome setting
-    case "$#" in
-    2) RECORD_CNT=$(get_value "$1" | wc -l) ;;
-    3) RECORD_CNT=$(get_value "$1" "$3" | wc -l) ;;
-    *) fatal "Programmer error, set_value must be passed 2 or 3 args, got $#" ;;
-    esac
-    MACHINE_CLAUSE=""
-    if [ "$RECORD_CNT" -eq 0 ] ; then
-        [ -n "$3" ] && MACHINE_CLAUSE=", $(machine_clause "$3")"
-        mysql_cmd "insert into settings set value = '$1', data = '$2' $MACHINE_CLAUSE"
-    else
-        [ "$#" -eq 3 ] && MACHINE_CLAUSE="and $(machine_clause "$3")"
-        mysql_cmd "update settings set data = '$2' where value = '$1' $MACHINE_CLAUSE"
-    fi
-}
-
-delete_setting_value () { # Totally remove some setting
-    case "$#" in
-    1) MACHINE_CLAUSE="" ;;
-    2) MACHINE_CLAUSE="and $(machine_clause "$2")" ;;
-    *) fatal "Programmer error, get_value must be passed 1 or 2 args, got $#" ;;
-    esac
-    mysql_cmd "delete from settings where value = '$1' $MACHINE_CLAUSE"
-}
-
-# Filter against a newline seperated exclude list
-filter_list () {
-    /bin/grep -vxF "$*" |
-    /usr/bin/sort -u
-}
diff --git a/abs/core-testing/LinHES-system/bin/mythbackup b/abs/core-testing/LinHES-system/bin/mythbackup
deleted file mode 100755
index 3b4edd4..0000000
--- a/abs/core-testing/LinHES-system/bin/mythbackup
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/bash
-
-#----------------------------------------------------------------------------
-. /usr/LH/bin/backupcommon || {
-    echo 1>&2 "Can not load common settings!"
-    exit 1
-}
-
-. /etc/osd_cat.cfg || {
-	color=yellow
-	outline=2
-	outlinecolour=black
-	shadow=0
-	shadowcolour=black
-	font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
-}
-#----------------------------------------------------------------------------
-
-# Function to display status onscreen
-osd()
-# Arg_1 = display text Arg_2 = delay time Arg_3 = line num
-{
-    TEXT=$1
-    killall -9 osd_cat
-    if [ $3 -gt 1 ]; then
-        for ((i=2; i <= $3 ; i++))
-        do
-            TEXT="\n"$TEXT
-        done
-    fi
-    printf "$TEXT" | osd_cat --lines=6 --pos=middle --align=center --delay=$2 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
-}
-
-# Prevent mythshutdown from shutting down the system in the middle...
-lock_myth
-
-# Play a sound to let you know I'm starting.
-play_sound init.wav
-
-# Keep a chain of recent backups,
-export DISPLAY=:0.0
-osd "Rolling over old backups..." 0 1
-echo "Starting rollover of old backups, this may take a while..."
-[ -f "$BACKUP_SQL" ] && shrink $BACKUP_SQL
-[ -f "$BACKUP_TAR" ] && shrink $BACKUP_TAR
-backup_roller .19 .18 .17 .16 .15 .14 .13 .12 .11 .10 .9 .8 .7 .6 .5 .4 .3 .2 .1 ''
-echo "Rollover completed."
-
-osd "Checking the database..." 0 2
-# Start with the database backup, first we make sure it's healthy, and
-# then we can dump it.
-# Doing this while the backend is active would be BAD.
-stop_mythbackend
-
-# Stop, check, and fix $DATABASE db to ensure clean copy, then restart it.
-stop_mysqld
-cd $DATABASE_DIR
-$MYISAMCHK -f *.MYI
-start_mysqld
-
-osd "Backing up database..." 0 3
-# Dumps the $DATABASE database
-$MYSQLDUMP -v -c -u root $DATABASE > $BACKUP_SQL
-shrink $BACKUP_SQL
-
-osd "Backing up files..." 0 4
-# Now to backup the other files, no fooling around, grab everything in the
-# list because you never know what you'll want, and we can always get clever
-# about what to restore later...
-
-# gather all the things in the list into a nice tidy bundle
-cd /
-$TAR cvf $BACKUP_TAR $BACKUP_LIST 2>&1 |
-    $SED -e '/Error exit delayed from previous errors/d'
-shrink $BACKUP_TAR
-
-# If you can't read this you've got no business restoring from it anyway.
-$CHOWN root:root $BACKUP_TAR* $BACKUP_SQL*
-$CHMOD go-rwx $BACKUP_TAR* $BACKUP_SQL*
-
-osd "Testing backup..." 0 5
-echo "Sanity checking your backup..."
-play_sound testing.wav
-# Play a sound to let you know the outcome.
-if check_files_and_tables $BACKUP_LIST ; then
-    osd "Backup completed successfully." 5 6
-    echo "Backup passes all checks."
-    COMPLETE_MSG="Last backup completed on `date '+%D @ %-I:%M %p'`"
-    play_sound complete.wav
-    STATUS=0
-else
-    osd "Backup FAILED." 5 6
-    echo "The backup is bad or already out of date!"
-    COMPLETE_MSG="Last backup FAILED on `date '+%D @ %-I:%M %p'`"
-    play_sound fail.wav
-    STATUS=1
-fi
-
-# Add Last backup status to menu item
-if grep "<description>" /usr/share/mythtv/themes/defaultmenu/mythbackup.xml >/dev/null 2>&1
-then
-    sed -i "s_\<description\>.*\<description\>_description\>$COMPLETE_MSG\<\/description_" /usr/share/mythtv/themes/defaultmenu/mythbackup.xml
-else
-    sed -i.orig " /NONE/ i\     \<description\>$COMPLETE_MSG\<\/description\>" /usr/share/mythtv/themes/defaultmenu/mythbackup.xml
-fi
-
-# Now we can restart the backend.
-start_mythbackend
-
-# Unlock the system again...
-unlock_myth
-
-exit $STATUS
diff --git a/abs/core-testing/LinHES-system/bin/mythrestore b/abs/core-testing/LinHES-system/bin/mythrestore
deleted file mode 100755
index 447b0b8..0000000
--- a/abs/core-testing/LinHES-system/bin/mythrestore
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/bin/bash
-
-#----------------------------------------------------------------------------
-. /usr/LH/bin/backupcommon || {
-    echo 1>&2 "Can not load common settings!"
-    exit 1
-}
-
-. /etc/osd_cat.cfg || {
-	color=yellow
-	outline=2
-	outlinecolour=black
-	shadow=0
-	shadowcolour=black
-	font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
-}
-#----------------------------------------------------------------------------
-
-# Function to display status onscreen
-osd()
-# Arg_1 = display text Arg_2 = delay time Arg_3 = line num
-{
-    TEXT=$1
-    killall -9 osd_cat
-    if [ $3 -gt 1 ]; then
-        for ((i=2; i <= $3 ; i++))
-        do
-            TEXT="\n"$TEXT
-        done
-    fi
-    printf "$TEXT" | osd_cat --lines=6 --pos=middle --align=center --delay=$2 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
-}
-
-do_file_updates() {  # A function because we need to do this in two places
-    echo "Doing any needed file updates..."
-    [ -n "$UPDATE_FILES" -a -f "$UPDATE_FILES" -a -x "$UPDATE_FILES" ] &&
-        "$UPDATE_FILES"
-}
-
-do_db_updates() {
-    # We need to redo this since we just restored the old settings...
-    lock_myth
-    # This is gross, but makes sure that the lock count has a sane value...
-    mysql_cmd "update settings set data = '1' where value = 'MythShutdownLock'"
-
-    # Clean up ambiguous schema version settings...
-    for val in $(mysql_cmd "select distinct value from settings where value like '%SchemaVer'") ; do
-        # Find the numeric maximum version for this schema
-        max_ver=$(mysql_cmd "select max(0 + ifnull(data, 0)) from settings where value = '$val'")
-        # Wipe out all the existing ones
-        mysql_cmd "delete from settings where value = '$val'"
-        # Insert a nice clean unique one.
-        mysql_cmd "insert into settings set value = '$val', data = '$max_ver'"
-    done
-
-    # This table causes problems with mythweb on upgrades...
-    mysql_cmd "update settings set data = '0' where value = 'WebDBSchemaVer'"
-    mysql_cmd "drop table mythweb_sessions" >/dev/null 2>&1
-}
-
-# Let's prevent mythshutdown from shutting down the system.
-lock_myth
-
-# Play a sound to let you know I'm starting.
-play_sound restore.wav
-export DISPLAY=:0.0
-
-# Doing this while the backend is active could be BAD.
-stop_mythbackend
-
-# If the standard backup file exists we try to restore the files based
-# on our restore list.
-if compression=$(compression_type "$BACKUP_TAR") ; then
-    osd "Restoring files..." 0 1
-    echo "Starting the restore of files..."
-    cd /
-    expand -c $BACKUP_TAR$compression |
-        $TAR xpvf - $RESTORE_LIST $EXCLUSION 2>&1 |
-        $SED -e '/Error exit delayed from previous errors/d'
-    echo "Completed the restore of files."
-fi
-
-# If the db backup file exists start the DB restore and upgrade
-if compression=$(compression_type "$BACKUP_SQL") ; then
-    echo "Starting the DB restore, this can take a while..."
-    echo "Clearing out the existing skeleton..."
-    #mysql_stdin < $DROP_SQL
-    osd "Recreating database..." 0 2
-    echo "Recreating the db..."
-    sleep 1
-    $MYSQLADMIN -u root create $DATABASE
-    osd "Restoring database..." 0 3
-    echo "Restoring the data (long)..."
-    expand -c $BACKUP_SQL$compression | mysql_stdin
-    echo "Doing any needed db updates..."
-    [ -n "$UPDATE_SQL" -a -f "$UPDATE_SQL" ] &&
-        mysql_stdin < $UPDATE_SQL
-    echo "Completed the DB restore."
-fi
-
-osd "Testing restore..." 0 4
-echo "Sanity checking your restore..."
-play_sound vr.wav
-# Play a sound to let you know the outcome.
-if check_files_and_tables $RESTORE_LIST ; then
-    osd "Restore completed successfully." 5 5
-    echo "Restore passes all checks."
-    COMPLETE_MSG="Last restore completed on `date '+%D @ %-I:%M %p'`"
-    play_sound restored.wav
-    STATUS=0
-else
-    osd "Restore FAILED." 5 5
-    echo "The restore failed or was already modified!"
-    COMPLETE_MSG="Last restore FAILED on `date '+%D @ %-I:%M %p'`"
-    play_sound rf.wav
-    STATUS=1
-fi
-
-# Add Last restore status to menu item
-if grep "<description>" /usr/share/mythtv/themes/defaultmenu/mythrestore.xml >/dev/null 2>&1
-then
-    sed -i "s_\<description\>.*\<description\>_description\>$COMPLETE_MSG\<\/description_" /usr/share/mythtv/themes/defaultmenu/mythrestore.xml
-else
-    sed -i.orig " /NONE/ i\     \<description\>$COMPLETE_MSG\<\/description\>" /usr/share/mythtv/themes/defaultmenu/mythrestore.xml
-fi
-
-# Make any updates _after_ we verify the backup...
-do_db_updates
-do_file_updates
-
-#post restore fixup for sshd
-/usr/MythVantage/bin/systemconfig.py -m user
-
-# Now it's more or less safe to restart the backend.
-start_mythbackend
-
-exit $STATUS
diff --git a/abs/core-testing/LinHES-system/bin/rollback.sh b/abs/core-testing/LinHES-system/bin/rollback.sh
deleted file mode 100755
index 12897da..0000000
--- a/abs/core-testing/LinHES-system/bin/rollback.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-#----------------------------------------------------------------------------
-. /usr/LH/bin/backupcommon || {
-    echo 1>&2 "Can not load common settings!"
-    exit 1
-}
-#----------------------------------------------------------------------------
-
-require file+r+x $MYTHSHUTDOWN
-
-# Prevent mythshutdown from shutting down the system in the middle...
-lock_myth
-
-echo "Starting rollback of old backups"
-backup_roller '' .1 .2 .3 .4 .5 .6 .7 .8 .9 .10 .11 .12 .13 .14 .15 .16 .17 .18 .19
-echo "Rollback completed."
-
-# Unlock the system again...
-unlock_myth