From dd2c1f96b8c3e06d26cc8a1f9c3d82ff6a20a39a Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 4 Jun 2009 09:57:23 -0500
Subject: linhes-config:  Add better debuging,  load the correct module from
 templates

---
 abs/core-testing/LinHES-config/mv_ir.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/abs/core-testing/LinHES-config/mv_ir.py b/abs/core-testing/LinHES-config/mv_ir.py
index b3552c5..6c2b2aa 100755
--- a/abs/core-testing/LinHES-config/mv_ir.py
+++ b/abs/core-testing/LinHES-config/mv_ir.py
@@ -189,7 +189,7 @@ def setup_blaster_transmiter(HostBlasterType):
         scrub_modules("/etc/modules.mythvantage","blaster")
 
 def setup_lcd(LCDtype, TEMPLATES, Remotetype):
-    logging.debug("    Start of setup_lcd")
+    logging.debug("____Start of setup_lcd____")
     logging.debug("    LCDType: %s", LCDtype)
     logging.debug("    Remotetype: %s", Remotetype)
     if LCDtype == "tinker":
@@ -213,8 +213,17 @@ def setup_lcd(LCDtype, TEMPLATES, Remotetype):
             logging.debug("    Adding module for LCD")
             scrub_modules("/etc/modules.mythvantage", "LCD")
             cmd = "cat %s >> /etc/modules.mythvantage" %lcdmodule
+            mv_common.runcmd(cmd)
         if Remotetype != "tinker":
+            lcdconf = "%s/LCD/%s/LCDd.conf" %(TEMPLATES,LCDtype)
             lcdlirc = "%s/LCD/%s" %(TEMPLATES,LCDtype)
+            mv_common.pacinstall("lcdproc")
+            if os.path.exists(lcdconf):
+                logging.debug("    Copying in lcdconf template file: %s",lcdconf)
+                mv_common.cp_and_log(lcdconf, "/etc/LCDd.conf")
+            else:
+                logging.debug("    %s is not present, will not copy it")
+
             if os.path.exists(lcdlirc+"/lircrc"):
                 logging.debug("    LCD seems to support lirc")
                 #setup the lirc aspect of the lcd
@@ -238,6 +247,9 @@ def setup_lcd(LCDtype, TEMPLATES, Remotetype):
                 cmd =  "chmod 755 /etc/lircrc"
                 mv_common.runcmd(cmd)
 
+            mv_common.add_service("lcdd")
+    logging.debug("__End of setup_lcd")
+
 def setup_ir(systemconfig, data_config):
     rc = False
     logging.info("____Start of IR____")
-- 
cgit v0.12

