From 6c0027e31a9509aea391c45385221373250506cf Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 8 Dec 2012 15:37:33 -0600
Subject: LinHES-system:   cherry picked   mythbackup: check if mythwelcome or
 mythfrontend are running. refs #875

---
 abs/core/LinHES-system/bin/backupcommon |  2 +-
 abs/core/LinHES-system/bin/mythbackup   | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/abs/core/LinHES-system/bin/backupcommon b/abs/core/LinHES-system/bin/backupcommon
index d112341..4305509 100644
--- a/abs/core/LinHES-system/bin/backupcommon
+++ b/abs/core/LinHES-system/bin/backupcommon
@@ -99,7 +99,7 @@ require file+r+x $AWK $BASH $BUNZIP2 $BZIP2 $CAT $CHMOD $CHOWN $EGREP $GREP \
 require dir+r+w+x /tmp "$BACKUP_DIR" "$DATABASE_DIR"
 
 play_sound () {
-    ($PLAYER $SILENCE $SOUNDS/$1 >& /dev/null)&
+    ($PLAYER $SILENCE $SILENCE $SOUNDS/$1 >& /dev/null)&
 }
 
 # Filter against an exclude list like the black list or the ignore list above
diff --git a/abs/core/LinHES-system/bin/mythbackup b/abs/core/LinHES-system/bin/mythbackup
index 3b4edd4..905beeb 100755
--- a/abs/core/LinHES-system/bin/mythbackup
+++ b/abs/core/LinHES-system/bin/mythbackup
@@ -46,6 +46,20 @@ echo "Starting rollover of old backups, this may take a while..."
 backup_roller .19 .18 .17 .16 .15 .14 .13 .12 .11 .10 .9 .8 .7 .6 .5 .4 .3 .2 .1 ''
 echo "Rollover completed."
 
+# Quit MythWelcome and MythFrontend if they are running.
+MWRUNNING=0
+FERUNNING=0
+if [ "$(pidof mythwelcome)" ]
+then
+    MWRUNNING=1
+    killall mythwelcome
+fi
+if [ "$(pidof mythfrontend)" ]
+then
+    FERUNNING=1
+    killall mythfrontend
+fi
+
 osd "Checking the database..." 0 2
 # Start with the database backup, first we make sure it's healthy, and
 # then we can dump it.
@@ -110,4 +124,13 @@ start_mythbackend
 # Unlock the system again...
 unlock_myth
 
+# Restart Mythwelcome or Mythfrontend if it was running.
+if [ $MWRUNNING -eq 1 ]
+then
+    exec su mythtv -c "/usr/bin/mythwelcome" > /dev/null 2>&1
+elif [ $FERUNNING -eq 1 ]
+then
+    exec su mythtv -c "/usr/LH/bin/mythfrontend-start" > /dev/null 2>&1
+fi
+
 exit $STATUS
-- 
cgit v0.12

