Merge branch 'testing'HEADmaster

4 files changed, 38 insertions, 5 deletions

diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session
index 7960bf5..bf71980 100755
--- a/abs/core/LinHES-system/LinHES-session
+++ b/abs/core/LinHES-system/LinHES-session
@@ -411,6 +411,7 @@ fi
 # this is done so that starting mythtv can loop.
 $WM &
 pid=$!
+/usr/LH/bin/enableIRWake.sh &
 mouse_move
 keylaunch
 unclutter
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index a236769..f0dfa3c 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=LinHES-system
-pkgver=8.6.0
+pkgver=8.6.1
 pkgrel=1
 arch=('x86_64')
 install=system.install
@@ -17,7 +17,7 @@ binfiles="LinHES-start optimize_mythdb.py myth_mtc.py
  mythfrontend-start set_windowmanager.sh myth_status.py myth_status.sh
  install_supplemental_service.sh get_airplay_key importfiles.sh
  lh_system_backup lh_system_backup_job lh_system_restore lh_system_restore_job
- lh_system_host_update lh_system_all_host_update
+ lh_system_host_update lh_system_all_host_update enableIRWake.sh
  add_storage.py balance_storage_groups.py empty_storage_groups.py
  remove_storage.py diskspace.sh cacheclean lh_backend_control.sh
  create_media_dirs.sh msg_client.py msg_daemon.py mythvidexport.py
@@ -80,7 +80,7 @@ package() {
 
 }
 
-md5sums=('c6e6b83a1f4c35ef4501e277657ab2ac'
+md5sums=('9e941d6c6d4edd56f1a89a7ab566763c'
          'ad5e144999b6f37931dea799c2761c7e'
          'de32a1c50101265dd7f6ca5037f7a26a'
          '2d7b8414ddce5f401331342ac1529c22'
@@ -97,11 +97,12 @@ md5sums=('c6e6b83a1f4c35ef4501e277657ab2ac'
          '33fbebbd546672cedd3c5e7350ab414e'
          'c773d8caacba8fbd4968e8afe5137bc6'
          '3edef50a49a47694bf8add39cc160add'
-         '01cbbf411d2a585feb71f2881755e5d8'
+         '88c9c36430875f9530edb79e11dc770a'
          'f421f670a9c74724037f70d1dabcad00'
          'eab2d188992b1ac561e0ba968544d7a3'
          '74e17d6f7453c52d56fecaed5c3f6ad5'
          '47e093e8cfe4b5b96602358e1f540832'
+         '4cc3401a94500fad269b25c60d99cc4d'
          '727a886a1ba237906f48cda2e4e7844b'
          '0c81e5cad656f6260e39cd7585b1421a'
          'e5bb027c54a2727d0bcf8d6fb357ba32'
diff --git a/abs/core/LinHES-system/enableIRWake.sh b/abs/core/LinHES-system/enableIRWake.sh
new file mode 100755
index 0000000..5b971b7
--- /dev/null
+++ b/abs/core/LinHES-system/enableIRWake.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+for vendProdID in `lsusb | sed -e 's/.*ID \([a-f0-9]\+:[a-f0-9]\+\).*/\1/g'`
+do
+    foundRemote=`grep -i "$vendProdID" /usr/MythVantage/templates/remotes/receiver_usb.id`
+    if [[ $? = 0 ]]
+    then
+        #echo Found: $foundRemote
+        vendID=`echo $vendProdID | cut -d":" -f1`
+        prodID=`echo $vendProdID | cut -d":" -f2`
+        for usbDevice in `grep . /sys/bus/usb/devices/*/power/wakeup | cut -d"/" -f6`
+        do
+            foundVendID=`cat /sys/bus/usb/devices/$usbDevice/idVendor`
+            foundProdID=`cat /sys/bus/usb/devices/$usbDevice/idProduct`
+            if [[ $foundVendID == $vendID && $foundProdID == $prodID ]]
+            then
+                echo "Enable wake for $foundRemote on $usbDevice"
+                sudo sh -c "echo 'enabled' > /sys/bus/usb/devices/$usbDevice/power/wakeup"
+            fi
+        done
+    fi
+done
diff --git a/abs/core/LinHES-system/lh_system_backup_job b/abs/core/LinHES-system/lh_system_backup_job
index 8539ff2..e248e1a 100755
--- a/abs/core/LinHES-system/lh_system_backup_job
+++ b/abs/core/LinHES-system/lh_system_backup_job
@@ -117,7 +117,16 @@ function backup(){
     done
 
     echo "Backup home dirs"
-    tar -zcf $BACKUPDIR/$DATE/home_dir.tar.gz -X $MYTHHOME/backup_config/backup_exclude.txt  $MYTHHOME /home/vncsvc /home/xymon
+    HOMEDIRS=""
+    if [ -d /home/vncsvc ]
+    then
+        HOMEDIRS="/home/vncsvc"
+    fi
+    if [ -d /home/xymon ]
+    then
+        HOMEDIRS="$HOMEDIRS /home/xymon"
+    fi
+    tar -zcf $BACKUPDIR/$DATE/home_dir.tar.gz -X $MYTHHOME/backup_config/backup_exclude.txt  $MYTHHOME $HOMEDIRS
 
     if [ -f $MYTHHOME/backup_config/backup_include.txt ]
     then