From af488dcf5c3d0354003910b3af841827980250a8 Mon Sep 17 00:00:00 2001 From: James Meyer <james.meyer@operamail.com> Date: Mon, 1 Jun 2009 15:23:07 -0500 Subject: LinHES-config: add "all" module and smolt --- abs/core-testing/LinHES-config/systemconfig.py | 41 +++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/abs/core-testing/LinHES-config/systemconfig.py b/abs/core-testing/LinHES-config/systemconfig.py index 1df4c39..f8521d4 100755 --- a/abs/core-testing/LinHES-config/systemconfig.py +++ b/abs/core-testing/LinHES-config/systemconfig.py @@ -49,7 +49,8 @@ def main(argv): global cmdmodule global systemconfig systemconfig["MVROOT"]=MVROOT - 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} + 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, "smolt":False, "all":False} try: opts, args = getopt.getopt(argv, 'c:hm:', ["help","modules" ] ) except getopt.GetoptError, why: @@ -67,16 +68,35 @@ def main(argv): if cmdmodule["this_is_install"] or cmdmodule["hostypec"]: systemconfig["hostypec"] = True + cmdmodule["smolt"] = True systemconfig["mythip"] = mv_network.setup_MYTH_IP(systemconfig) systemconfig["mythdhcp"] = mv_network.setup_MYTH_DHCP(systemconfig) + if cmdmodule["all"]: + logging.info("*** WILL RUN ALL MODULES ***") + cmdmodule["hostype"] = True + cmdmodule["ir"]= True + cmdmodule["network"] = True + cmdmodule["audio"] = True + cmdmodule["misc"] = True + cmdmodule["sleep"] = True + cmdmodule["webuser"] = True + cmdmodule["screensaver"] = True + cmdmodule["advanced"] = True + cmdmodule["software"] = True + cmdmodule["advancedX"] = True + cmdmodule["smolt"] = True + + + if cmdmodule["hostype"]: import hostype cmdmodule["advancedX"] = False setup_x(systemconfig) cmdmodule["ir"] = True hostype.hostypeprint(systemconfig) + cmdmodule["smolt"] = True if cmdmodule["network"]: mv_network.setup_network(systemconfig) @@ -85,10 +105,14 @@ def main(argv): if cmdmodule["ir"] == True: import mv_ir - restartfe = mv_ir.setup_ir(systemconfig,data_config) + restart = mv_ir.setup_ir(systemconfig,data_config) + restartfe = restart[0] + restartlcd = restart[1] if restartfe == True: logging.debug(" Setting the frontend to restart due to lirc change") cmdmodule["restartfe"] = True + cmdmodule["smolt"] = True + if cmdmodule["audio"] == True: logging.debug("______Start of Audio Configuration______") @@ -128,10 +152,19 @@ def main(argv): setup_x(systemconfig) if cmdmodule["restartfe"]: - mv_common.restartfe() + mv_common.restartfe(restartlcd) if cmdmodule["reloadfe"]: - mv_common.reloadfe() + mv_common.reloadfe(systemconfig["dbhost"],restartlcd) + + if cmdmodule["smolt"]: + import mv_smolt + mv_smolt.setup_smolt_type(systemconfig["SystemType"], + systemconfig["Remotetype"], + systemconfig["RunFrontend"], + data_config.MYTHHOME, + data_config.SYSTEMTYPE) + if __name__ == "__main__": -- cgit v0.12