Merge branch 'testing'

1 files changed, 43 insertions, 19 deletions

diff --git a/abs/core/LinHES-config/systemconfig.py b/abs/core/LinHES-config/systemconfig.py
index 1af9daf..c7cbb8a 100755
--- a/abs/core/LinHES-config/systemconfig.py
+++ b/abs/core/LinHES-config/systemconfig.py
@@ -33,7 +33,35 @@ logging.getLogger('').addHandler(infofile)
 
 
 def usage():
-    logging.info("tell people how to use this")
+    logging.info("List of available modules")
+    logging.info("more then one module by be called")
+    logging.info("Ex:  misc,sleep,audio")
+    cmd_list = ["misc",
+                "sleep",
+               "hostype",
+               "hostypec" ,
+               "advanced" ,
+               "audio" ,
+               "network" ,
+               "advancedX" ,
+               "webuser" ,
+               "restartfe" ,
+               "reloadfe" ,
+               "ddns" ,
+               "screensaver" ,
+               "ir" ,
+               "user",
+               "software",
+               "plugins",
+               "smolt",
+               "all",
+               "func",
+               "supplemental",
+               "vnc",
+               "fileshare",
+               "config_xml"]
+    for i in cmd_list:
+        logging.info(i)
 
 def setup_x(systemconfig):
     if  mv_common.read_config(mv_common.module_config,"xorg")  == False  :
@@ -95,9 +123,9 @@ def generate_config_xml(uuid,dbhost):
   </UPnP>
 </Configuration>
     '''
-    
-    
-    
+
+
+
     configxml= configxml_t %(dbhost,uuid)
     return configxml
 
@@ -296,21 +324,17 @@ def main(argv):
             logging.info("____Skipping of Audio, config disabled____")
         else:
             logging.debug("______Start of Audio Configuration______")
-            if not systemconfig.get("Audiotype") == "tinker":
-                if cmdmodule["this_is_install"]:
-                    if systemconfig.get("Audiotype") == "OSS":
-                        mv_common.pacinstall("oss")
-                        mv_common.add_service("oss")
-
-                cmd="%s/bin/soundconfig.sh -t real -i %s -d %s" %(MVROOT,
-                                                systemconfig.get("Audiotype"),
-                                                systemconfig["SoundDevice"])
-                mv_common.runcmd(cmd)
-
-                mv_common.reloadfe(systemconfig.get("dbhost"),restartlcd)
-            else:
-                logging.debug("    Tinker mode(audio), not changing configuration")
-            logging.debug("__End of audio")
+            if cmdmodule["this_is_install"]:
+                if systemconfig.get("Audiotype") == "OSS":
+                    mv_common.pacinstall("oss")
+                    mv_common.add_service("oss")
+
+            cmd="%s/bin/soundconfig.sh -t real -i %s -d %s" %(MVROOT,
+                                            systemconfig.get("Audiotype"),
+                                            systemconfig["SoundDevice"])
+            mv_common.runcmd(cmd)
+            mv_common.reloadfe(systemconfig.get("dbhost"),restartlcd)
+        logging.debug("__End of audio")
 
     if cmdmodule["misc"]:
         if  mv_common.read_config(mv_common.module_config,"misc")  == False  :