summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2009-06-01 20:23:07 (GMT)
committerJames Meyer <james.meyer@operamail.com>2009-06-01 20:23:07 (GMT)
commitaf488dcf5c3d0354003910b3af841827980250a8 (patch)
treea52e1c6b035363c4efbf8874d572b50818d7efed
parentaa8cbfddbec8df7338a629fd96e6cfce0bb64ed7 (diff)
downloadlinhes_pkgbuild-af488dcf5c3d0354003910b3af841827980250a8.zip
linhes_pkgbuild-af488dcf5c3d0354003910b3af841827980250a8.tar.gz
linhes_pkgbuild-af488dcf5c3d0354003910b3af841827980250a8.tar.bz2
LinHES-config: add "all" module and smolt
-rwxr-xr-xabs/core-testing/LinHES-config/systemconfig.py41
1 files 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__":