Merge branch 'testing'

3 files changed, 15 insertions, 5 deletions

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 75b93a2..a47d7ea 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=8.1
-pkgrel=8
+pkgrel=11
 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'
@@ -133,7 +133,7 @@ package() {
     install -o root -g root  -D -m 0755 blacklist_nouveau.conf $pkgdir/etc/modprobe.d/blacklist_nouveau.conf
 }
 
-md5sums=('8ee14247b04ab4152d4919d4d4b8d869'
+md5sums=('e4faaa3d5f180d796e200b701048b008'
          '3f6855b7bb860a44f96a972c2e80f497'
          'f6e9dd7bc6cf0aaa3bd203dab4cb79b9'
          '2596460462cf6c889cf8f95485537b20'
@@ -159,7 +159,7 @@ md5sums=('8ee14247b04ab4152d4919d4d4b8d869'
          'c0549457750c4f8e8038d904a0f3012a'
          '075fe16ef92621ce31f41df5c5577daf'
          'b845de3e05c1734cce4b9ac5e8f1baaf'
-         '31ad5416bf2ab1909338a16035941127'
+         '6356c271bf6639002d4c59406250a1f6'
          '8b7dce4a3a0a281fa6656aa8781a648e'
          'f7f2dc11d1ba454cd25eeaa133104b62'
          '824e49d9b01fed295c704ab68908b464'
diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index ba88ade..fe4a395 100755
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -506,6 +506,15 @@ def partition_disk():
     else:
         create_partitions_gpt(datadisk, start_sector, hostoptions["datasize"], "primary")
     
+    #set active
+    logging.debug("setting active partition for mbr")
+    
+    cmd = "parted %s set 1 boot on" %rootdisk
+    runcmd(cmd)
+
+    cmd = "sfdisk --force -A1 %s" %rootdisk
+    runcmd(cmd)
+    
     logging.debug("sleeping for 5 seconds")
     time.sleep(5)
 
diff --git a/abs/core/LinHES-config/mv_ir.py b/abs/core/LinHES-config/mv_ir.py
index f481fa4..1eae985 100755
--- a/abs/core/LinHES-config/mv_ir.py
+++ b/abs/core/LinHES-config/mv_ir.py
@@ -202,7 +202,8 @@ def setup_ir_receiver(ReceiverType,TEMPLATES,HDHRlirc_device,myip):
     logging.info("    Configuring receiver %s", ReceiverType)
     if ReceiverType == "serial":
         scrub_modules("/etc/modules.mythvantage","lirc")
-        add_module("/etc/modules.mythvantage","lirc_serial    #lirc")
+        #loading takes place in remotes/run
+        #add_module("/etc/modules.mythvantage","lirc_serial    #lirc")
         cmd = "load-modules-mythvantage.sh"
         mv_common.runcmd(cmd)
         mv_common.remove_service("igdaemon")
@@ -301,7 +302,7 @@ def setup_blaster_transmiter(HostBlasterType):
         mv_common.add_service("igdaemon")
     elif HostBlasterType == "serial":
         scrub_modules("/etc/modules.mythvantage","blaster")
-        add_module("/etc/modules/.mythvantage","lirc_serial    #blaster")
+        #add_module("/etc/modules/.mythvantage","lirc_serial    #blaster")
         cmd = "load-modules-mythvantage.sh"
         mv_common.runcmd(cmd)
     elif HostBlasterType == "pvr150":