From 70c7883467b9348ce43b2822664bfa19af4d553d Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 4 Jun 2009 11:02:30 -0500
Subject: linhes-config: misc fixes
---
abs/core-testing/LinHES-config/mv_advanced.py | 2 +-
abs/core-testing/LinHES-config/mv_common.py | 4 ++++
abs/core-testing/LinHES-config/systemconfig.py | 19 ++++++++++---------
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/abs/core-testing/LinHES-config/mv_advanced.py b/abs/core-testing/LinHES-config/mv_advanced.py
index f5a0f29..01351df 100755
--- a/abs/core-testing/LinHES-config/mv_advanced.py
+++ b/abs/core-testing/LinHES-config/mv_advanced.py
@@ -105,7 +105,7 @@ def setup_evrouter(UseEvrouter,EvrouterConfig,template):
return
mv_common.pacinstall("evrouter")
mv_common.pacinstall("Xvfb")
- mv_common.cp_and_log(template+EvrouterConfig,"/etc/evrouter.cfg")
+ mv_common.cp_and_log(template+"/evrouter/"+EvrouterConfig,"/etc/evrouter.cfg")
mv_common.add_service("evrouter")
mv_common.add_service("Xvfb")
else:
diff --git a/abs/core-testing/LinHES-config/mv_common.py b/abs/core-testing/LinHES-config/mv_common.py
index 0cbabf5..9b33454 100755
--- a/abs/core-testing/LinHES-config/mv_common.py
+++ b/abs/core-testing/LinHES-config/mv_common.py
@@ -120,6 +120,7 @@ def pacremove(pkg):
else:
logging.info(" Removing %s",pkg)
cmd ='''pacman --noconfirm -R %s ''' %pkg
+ runcmd(cmd)
else:
logging.info(" %s is blacklisted, will not remove",pkg)
@@ -152,6 +153,9 @@ def reloadfe(dbhost,RESTART_LCD):
def restartfe(RESTART_LCD):
logging.debug("____Start of restartfe____")
+ if data_config.SYSTEMTYPE=="LinHES":
+ logging.debug(" LinHES seems to be running will not restartfe")
+ return
logging.info(" Restarting frontend")
restartLCD(RESTART_LCD)
cmd="killall -9 mythfrontend"
diff --git a/abs/core-testing/LinHES-config/systemconfig.py b/abs/core-testing/LinHES-config/systemconfig.py
index 7e5e3b1..77471c2 100755
--- a/abs/core-testing/LinHES-config/systemconfig.py
+++ b/abs/core-testing/LinHES-config/systemconfig.py
@@ -50,7 +50,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, "smolt":False, "all":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}
try:
opts, args = getopt.getopt(argv, 'c:hm:', ["help","modules" ] )
except getopt.GetoptError, why:
@@ -93,7 +93,7 @@ def main(argv):
if cmdmodule["hostype"]:
import mv_hostype
- cmdmodule["advancedX"] = False
+ cmdmodule["advancedX"] = True
setup_x(systemconfig)
cmdmodule["ir"] = True
mv_hostype.hostypeprint(systemconfig)
@@ -131,6 +131,7 @@ def main(argv):
mv_misc.setup_nfs(systemconfig)
if cmdmodule["sleep"]:
+ import mv_misc
mv_misc.setup_sleep(systemconfig)
if cmdmodule["webuser"]:
@@ -148,7 +149,7 @@ def main(argv):
import mv_advanced
mv_advanced.setup_advanced(systemconfig, data_config)
- if cmdmodule["software"]:
+ if cmdmodule["software"] or cmdmodule["plugins"]:
import mv_software
mv_software.setup_software(systemconfig, data_config)
@@ -204,12 +205,12 @@ if __name__ == "__main__":
systemconfig["TEMPLATES"] = os.environ["TEMPLATES"]
logging.debug("______START OF DEBUG______")
main(sys.argv[1:])
- #logging.debug("______cmd line options______")
- #for i in cmdmodule.items():
- #logging.debug (i)
- #logging.debug("______systemconfig______")
- #for i in systemconfig.items():
- #logging.debug(i)
+ logging.debug("______cmd line options______")
+ for i in cmdmodule.items():
+ logging.debug (i)
+ logging.debug("______systemconfig______")
+ for i in systemconfig.items():
+ logging.debug(i)
#pass
--
cgit v0.12