Merge branch 'testing'

10 files changed, 84 insertions, 49 deletions

diff --git a/abs/core/LinHES-config/LinHES-release b/abs/core/LinHES-config/LinHES-release
index 747db47..f4126e5 100644
--- a/abs/core/LinHES-config/LinHES-release
+++ b/abs/core/LinHES-config/LinHES-release
@@ -1 +1 @@
-LinHES 8.0 (Trip the bits) 
+LinHES R8.1 (It isn't only a girl's name) 
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index d4983bb..75b93a2 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,12 +1,12 @@
 pkgname=LinHES-config
-pkgver=8.0
-pkgrel=11
+pkgver=8.1
+pkgrel=8
 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'
+depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
 	 'sg3_utils' 'nmbscan' 'system-templates' 'rsync' 'python-parted'
 	 'python-pexpect' 'python-netifaces' 'xcursor-vanilla-dmz-aa'
-	 'python-iplib' 'mythinstall>=2-10' 'sudo' 'setserial' 'udevil')
+	 'python-iplib' 'sudo' 'setserial' 'udevil' 'balance' )
 arch=('i686' 'x86_64')
 
 source=(mv_install.py 09_mythvantge_runit_grub
@@ -19,7 +19,7 @@ source=(mv_install.py 09_mythvantge_runit_grub
 	install_db_chroot.sh
 	restore_default_settings.sh
 	myth_settings_wrapper.sh
-        xconfig.sh
+    xconfig.sh
 	timezip.py
 	soundconfig.sh
 	LinHES-release
@@ -133,13 +133,13 @@ package() {
     install -o root -g root  -D -m 0755 blacklist_nouveau.conf $pkgdir/etc/modprobe.d/blacklist_nouveau.conf
 }
 
-md5sums=('c832059cd635359d39a2ac3166ff463c'
+md5sums=('8ee14247b04ab4152d4919d4d4b8d869'
          '3f6855b7bb860a44f96a972c2e80f497'
-         'aaeb581275433649ff74e05da5e61a78'
+         'f6e9dd7bc6cf0aaa3bd203dab4cb79b9'
          '2596460462cf6c889cf8f95485537b20'
          '985891a43f7c4c983eb2a362162f1a0f'
-         'fda01259a4bc74d83c9092d338bd247a'
-         '768504ef10ecd11a22875ccea9fcf62b'
+         '261ba62515edd7a13d46cbeb1b0eadca'
+         '31106caee7f621e7c5f008ccd9600b36'
          'f73d6d6f98839e900cb6685bf5dc4eae'
          'b8becf69d4309b938ceba3178c799270'
          '2a7f3b34e522acfd08283b86c8926aba'
@@ -147,12 +147,12 @@ md5sums=('c832059cd635359d39a2ac3166ff463c'
          '5012fbd31d205a6d6b0a1d8caf3eba8f'
          '157e73d0f90d7b306aba8f5921aeedd3'
          'a805504b6593eaa416fe5f32cd4d1b9e'
-         '8ba06c2ce6129371548cc360ccca27f8'
+         '952af1c0a44579c04a405ffce9aed264'
          '5f890ea9bda6aef652d2560ca19dac07'
          'ab2aa42c2947148c2b1cac0ade6d1d55'
          'd429b59d3cfb37b0624c6a4a71a7c2c0'
          'f6a935c35123fdc7c259c01cbc794a64'
-         '5e865cc04fe5de8a39d9c1e377fc4ebe'
+         'b3ce302473883ca118d4a58f1b1306e2'
          'd3490e93f313bbbcbc6c3693c56b9c17'
          'e959df98947eb0d2ea64ff616b61aab5'
          '2506860a416e1988934225d80d501c2c'
@@ -171,7 +171,7 @@ md5sums=('c832059cd635359d39a2ac3166ff463c'
          '299c24c0820fc9c483c820db2595e3cb'
          'cf51cb22e23218ae7e9b55cac1ba3a7f'
          '781f161a79c3188a31c8615b8258b241'
-         '540a5b7f63a83ad53d6924c637bfd1c7'
+         '70749be12c98d4b8fd283bd5dd9182bb'
          '2596460462cf6c889cf8f95485537b20'
          'dc3c5270691a62600475705f4cb78b56'
          '4804aa93aaad3dfcfff08cd9ffd68836'
@@ -181,4 +181,4 @@ md5sums=('c832059cd635359d39a2ac3166ff463c'
          'c9279fa095af624ee3d9bc75d3328360'
          '02cf69074d2bbacef05fa3e451af9af3'
          '85d15efc55074a94c58d44542ea1dd13'
-         'e410d108ed4778dd898dc68fad4e8828')
+         '7acbd2064db905e76372a0618b24a6d9')
diff --git a/abs/core/LinHES-config/autocard.py b/abs/core/LinHES-config/autocard.py
index c461714..19563a4 100644..100755
--- a/abs/core/LinHES-config/autocard.py
+++ b/abs/core/LinHES-config/autocard.py
@@ -766,20 +766,21 @@ def gather_ceton(tuner_list):
         command="/usr/MythVantage/bin/discover_infinitv.py %s" %iface
         results=os.popen(command,'r')
         lines=results.readlines()
-        #try:
-        if lines[0].strip().split()[0] == "no":
-            print "Ceton not detected"
-        else:
-            for line in lines:
-                #Found InfiniTV. Location URL: http://192.168.200.1/description.xml
-                #cetondevice = line.strip().split()[0]
-                cetonip = line.strip().split("/")[2]
-
-                tuners = [0,1,2,3]
-                for t in tuners:
-                    tuner_list.append(infinitv_tuner(t,cetonip))
-        #except:
-        #    print "Error finding Ceton InfinitTV"
+        try:
+            print lines
+            if lines[0].strip().split()[0].lower() == "no":
+                print "Ceton not detected on %s" %iface
+            else:
+                for line in lines:
+                    #Found InfiniTV. Location URL: http://192.168.200.1/description.xml
+                    #cetondevice = line.strip().split()[0]
+                    cetonip = line.strip().split("/")[2]
+
+                    tuners = [0,1,2,3]
+                    for t in tuners:
+                        tuner_list.append(infinitv_tuner(t,cetonip))
+        except:
+            print "Error finding Ceton InfinitTV on %s" %iface
 
     return tuner_list
 
@@ -816,11 +817,16 @@ def find_ceton_network_list():
     for i in netinterfaces:
         if i.startswith("ctn") or i.startswith("usb"):
             #configure and start ctn network
-            config_ctn_network(i)
-
-            #read ip
-            ctnip.append(netifaces.ifaddresses(i)
-                        [netifaces.AF_INET][0]['addr'])
+            try:
+                config_ctn_network(i)
+
+                #read ip
+                ctnip.append(netifaces.ifaddresses(i)
+                            [netifaces.AF_INET][0]['addr'])
+            except:
+                print "    * Error scanning network interface %s" %i
+                print "    * Please check that the interface is ready and configured"
+                
     return ctnip
 
 #--end of linhes specific
diff --git a/abs/core/LinHES-config/config.install b/abs/core/LinHES-config/config.install
index c9171a6..4c99e03 100644
--- a/abs/core/LinHES-config/config.install
+++ b/abs/core/LinHES-config/config.install
@@ -15,6 +15,7 @@ post_install() {
         echo "List of packages to ignore" > /etc/blacklist.package
         echo "one package per line" >> /etc/blacklist.package
     fi
+    cat /etc/LinHES-release > /etc/os_myth_release
 }
 
 # arg 1:  the new package version
diff --git a/abs/core/LinHES-config/discover_infinitv.py b/abs/core/LinHES-config/discover_infinitv.py
index 5c39c59..421ba84 100755
--- a/abs/core/LinHES-config/discover_infinitv.py
+++ b/abs/core/LinHES-config/discover_infinitv.py
@@ -74,7 +74,7 @@ if __name__ == "__main__":
     try:
         timeout = float(sys.argv[2])
     except:
-        timeout=5
+        timeout=15
     L = find_the_infiniTV(interface_ip=interface_ip)
     thread.start_new_thread(L.listen, ())
     time.sleep(timeout)
diff --git a/abs/core/LinHES-config/install_functions.sh b/abs/core/LinHES-config/install_functions.sh
index fd33e00..d841947 100755
--- a/abs/core/LinHES-config/install_functions.sh
+++ b/abs/core/LinHES-config/install_functions.sh
@@ -49,7 +49,7 @@ function parse_cmdline_2_db(){
 
 
 function bootsplash_setup (){
-    echo $CMDLINE | grep -q splash=silent
+    echo $CMDLINE | grep -q splash
     if [ $? -eq 0 ]
     then
         update_db_settings Hostbootsplash 1
diff --git a/abs/core/LinHES-config/install_proxy.sh b/abs/core/LinHES-config/install_proxy.sh
index 99609cc..7d987f5 100755
--- a/abs/core/LinHES-config/install_proxy.sh
+++ b/abs/core/LinHES-config/install_proxy.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 export TERM=vt100
 MVHOSTNAME=apheleia
+export MYTH_RUN_STATUS="1"
 . /etc/profile
 TEMP_TEMPLATES=/tmp/templates
 disk=$2
diff --git a/abs/core/LinHES-config/mv_config.py b/abs/core/LinHES-config/mv_config.py
index f15f41c..e2c3b83 100755
--- a/abs/core/LinHES-config/mv_config.py
+++ b/abs/core/LinHES-config/mv_config.py
@@ -13,7 +13,7 @@ NOOPDEBUG="FALSE"
 TEMP_TEMPLATES="/tmp/templates"
 share_exclude_dir=['mysql','srv']
 
-SG_MAP_AUTONFS_SKIP=['media/tv','media/video','media/video_stuff','media/streaming']
+SG_MAP_AUTONFS_SKIP=['media/tv','media/music','media/video','media/artwork','media/streaming']
 
 MAP_AUTONFS_SKIP=['lost+found','media','backup']
 nfs_options="hard,intr,actimeo=0"
diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index 57b784b..ba88ade 100755
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -1255,7 +1255,7 @@ def double_mount(fe_only=False, upgrade=False):
                 cmd = "chroot " + data_config.MOUNTPOINT +" /usr/LH/bin/add_storage.py --double_myth --no_mount"
             else:
                 #cmd = "chroot " + data_config.MOUNTPOINT +" /usr/LH/bin/add_storage.py --double_myth --no_mount"
-                cmd = "chroot " + data_config.MOUNTPOINT +" /usr/LH/bin/add_storage.py --double_myth --add_fe_sg --add_be_sg "
+                cmd = "chroot " + data_config.MOUNTPOINT +" /usr/LH/bin/add_storage.py --double_myth --add_sg"
 
         if runcmd(cmd)[0] == 0:
             logging.debug("    Add storage worked, breaking out of loop")
diff --git a/abs/core/LinHES-config/systemconfig.py b/abs/core/LinHES-config/systemconfig.py
index 07b2820..1af9daf 100755
--- a/abs/core/LinHES-config/systemconfig.py
+++ b/abs/core/LinHES-config/systemconfig.py
@@ -53,25 +53,52 @@ def setup_x(systemconfig):
 
 
 def generate_config_xml(uuid,dbhost):
-    configxml_t ='''
-<Configuration>
+    #configxml_t ='''
+#<Configuration>
+  #<UPnP>
+    #<UDN>
+      #<MediaRenderer>%s</MediaRenderer>
+    #</UDN>
+    #<MythFrontend>
+      #<DefaultBackend>
+        #<DBHostName>%s</DBHostName>
+        #<DBUserName>mythtv</DBUserName>
+        #<DBPassword>mythtv</DBPassword>
+        #<DBName>mythconverg</DBName>
+        #<DBPort>0</DBPort>
+      #</DefaultBackend>
+    #</MythFrontend>
+  #</UPnP>
+#</Configuration>
+    #'''
+    configxml_t='''
+    <Configuration>
+  <LocalHostName>my-unique-identifier-goes-here</LocalHostName>
+  <Database>
+    <PingHost>1</PingHost>
+    <Host>%s</Host>
+    <UserName>mythtv</UserName>
+    <Password>mythtv</Password>
+    <DatabaseName>mythconverg</DatabaseName>
+    <Port>3306</Port>
+  </Database>
+  <WakeOnLAN>
+    <Enabled>0</Enabled>
+    <SQLReconnectWaitTime>0</SQLReconnectWaitTime>
+    <SQLConnectRetry>5</SQLConnectRetry>
+    <Command>echo 'WOLsqlServerCommand not set'</Command>
+  </WakeOnLAN>
   <UPnP>
     <UDN>
       <MediaRenderer>%s</MediaRenderer>
     </UDN>
-    <MythFrontend>
-      <DefaultBackend>
-        <DBHostName>%s</DBHostName>
-        <DBUserName>mythtv</DBUserName>
-        <DBPassword>mythtv</DBPassword>
-        <DBName>mythconverg</DBName>
-        <DBPort>0</DBPort>
-      </DefaultBackend>
-    </MythFrontend>
   </UPnP>
 </Configuration>
     '''
-    configxml= configxml_t %(uuid,dbhost)
+    
+    
+    
+    configxml= configxml_t %(dbhost,uuid)
     return configxml
 
 def gen_uuid():