LinHES-config: hookup supplemental and correct dolphinemu,webonlinhes so that it doesn't use hyphons.

1 files changed, 17 insertions, 3 deletions

diff --git a/abs/core/LinHES-config/systemconfig.py b/abs/core/LinHES-config/systemconfig.py
index a8bae81..9a9cd11 100755
--- a/abs/core/LinHES-config/systemconfig.py
+++ b/abs/core/LinHES-config/systemconfig.py
@@ -62,7 +62,7 @@ def main(argv):
     global systemconfig
     systemconfig["MVROOT"]=MVROOT
     restartlcd = False
-    cmdmodule={"misc":False , "sleep":False , "hostype":False , "hostypec":False , "advanced":False , "audio":False , "network":False , "advancedX":False , "webuser":False , "restartfe":False , "reloadfe":False , "ddns":False , "screensaver":False , "ir":False , "this_is_install":False , "user":False, "software":False, "plugins":False, "smolt":False, "all":False, "dhcp_request":False , "func":False}
+    cmdmodule={"misc":False , "sleep":False , "hostype":False , "hostypec":False , "advanced":False , "audio":False , "network":False , "advancedX":False , "webuser":False , "restartfe":False , "reloadfe":False , "ddns":False , "screensaver":False , "ir":False , "this_is_install":False , "user":False, "software":False, "plugins":False, "smolt":False, "all":False, "dhcp_request":False , "func":False, "supplemental":False}
     try:
         opts,  args = getopt.getopt(argv,  'c:hm:d:',  ["help","modules" ] )
     except getopt.GetoptError, why:
@@ -83,7 +83,7 @@ def main(argv):
 
     if cmdmodule["this_is_install"] or cmdmodule["hostypec"]:
         systemconfig["hostypec"] = True
-        cmdmodule["smolt"] = True
+        #cmdmodule["smolt"] = True
 
     systemconfig["mythip"] = mv_network.setup_MYTH_IP(systemconfig)
     systemconfig["mythdhcp"] = mv_network.setup_MYTH_DHCP(systemconfig)
@@ -154,8 +154,16 @@ def main(argv):
         else:
             logging.debug("______Start of Audio Configuration______")
             if not systemconfig.get("Audiotype") == "tinker":
-                cmd="%s/bin/soundconfig.sh -t real -i %s -d %s" %(MVROOT,systemconfig.get("Audiotype"),systemconfig["SoundDevice"])
+                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")
@@ -234,6 +242,12 @@ def main(argv):
         cmd = '''dhcpcd -t4 -h' ' -Td %s > /tmp/mvnetwork.dhcpinfo ''' %dhcp_dev
         mv_common.runcmd(cmd)
 
+    if cmdmodule["supplemental"] or cmdmodule["this_is_install"]:
+        import mv_supplemental
+        mv_supplemental.windowmanager(systemconfig)
+        mv_supplemental.supplemental(systemconfig)
+
+
 
 if __name__ == "__main__":