linhes-config: add support for remotes in the home dir.

install_functions: add the function in_kernel_support.  The same change is also in the lircd runit script.

1 files changed, 42 insertions, 18 deletions

diff --git a/abs/core/LinHES-config/mv_ir.py b/abs/core/LinHES-config/mv_ir.py
index f3be276..5316bbc 100755
--- a/abs/core/LinHES-config/mv_ir.py
+++ b/abs/core/LinHES-config/mv_ir.py
@@ -80,7 +80,7 @@ def include_file( incfile,filename):
     f.write("\n")
     f.close()
 
-def setup_ir_remote(Remotetype,templates):
+def setup_ir_remote(Remotetype,templates,mythhome):
     logging.debug("    Setup of remote type %s",Remotetype)
     if Remotetype == "no_remote":
         mv_common.remove_service("lircd")
@@ -92,22 +92,46 @@ def setup_ir_remote(Remotetype,templates):
         mv_common.runcmd(cmd)
         cmd = "mv /etc/lircrc /etc/lircrc-%s" %currenttime
         mv_common.runcmd(cmd)
-        files = templates + "/remotes/" + Remotetype + "/lircd*"
-        logging.debug("    Using %s",files)
-        for filename in glob.glob(files):
-            # Ignore subfolders
-            if os.path.isdir (filename):
-                logging.debug("    %s is a dir, skipping",filename)
-                continue
-            include_file("/etc/lircd.conf",filename)
-        files = templates + "/remotes/" + Remotetype + "/lircrc*"
-        logging.debug("    Using %s",files)
-        for filename in glob.glob(files):
-            # Ignore subfolders
-            if os.path.isdir (filename):
-                logging.debug("    %s is a dir, skipping",filename)
-                continue
-            include_file("/etc/lircrc",filename)
+
+
+        if os.path.isdir(mythhome+"remotes"+Remotetype):
+            #search home dir
+            files = mythhome + "/remotes/" + Remotetype + "/lircd*"
+            logging.debug("    Using %s",files)
+            for filename in glob.glob(files):
+                # Ignore subfolders
+                if os.path.isdir (filename):
+                    logging.debug("    %s is a dir, skipping",filename)
+                    continue
+                include_file("/etc/lircd.conf",filename)
+            files = mythhome + "/remotes/" + Remotetype + "/lircrc*"
+            logging.debug("    Using %s",files)
+            for filename in glob.glob(files):
+                # Ignore subfolders
+                if os.path.isdir (filename):
+                    logging.debug("    %s is a dir, skipping",filename)
+                    continue
+                include_file("/etc/lircrc",filename)
+        else:
+            #template dir
+            files = templates + "/remotes/" + Remotetype + "/lircd*"
+            logging.debug("    Using %s",files)
+            for filename in glob.glob(files):
+                # Ignore subfolders
+                if os.path.isdir (filename):
+                    logging.debug("    %s is a dir, skipping",filename)
+                    continue
+                include_file("/etc/lircd.conf",filename)
+            files = templates + "/remotes/" + Remotetype + "/lircrc*"
+            logging.debug("    Using %s",files)
+            for filename in glob.glob(files):
+                # Ignore subfolders
+                if os.path.isdir (filename):
+                    logging.debug("    %s is a dir, skipping",filename)
+                    continue
+                include_file("/etc/lircrc",filename)
+
+
         cmd =  "chmod 755 /etc/lircrc"
         mv_common.runcmd(cmd)
         mv_common.add_service("lircd")
@@ -310,7 +334,7 @@ def setup_ir(systemconfig, data_config):
         else:
             remotetype = systemconfig.get("Remotetype")
 
-        setup_ir_remote(remotetype,systemconfig.get("TEMPLATES"))
+        setup_ir_remote(remotetype,systemconfig.get("TEMPLATES"),data_config.MYTHHOME)
         setup_lirc_links(data_config.MYTHHOME)
 
         if systemconfig.get("ReceiverType"):