From 0426c30ca0ecb48631068e3ea6f143253a75c25e Mon Sep 17 00:00:00 2001 From: James Meyer Date: Mon, 17 Aug 2009 13:26:15 -0500 Subject: linhes-config: use lists as intended. --- abs/core-testing/LinHES-config/mv_hostype.py | 20 ++++++++++---------- abs/mv-core/MythVantage-config/PKGBUILD | 2 +- abs/mv-core/MythVantage-config/mv_hostype.py | 18 +++++++++--------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/abs/core-testing/LinHES-config/mv_hostype.py b/abs/core-testing/LinHES-config/mv_hostype.py index b3899ff..5d033fa 100755 --- a/abs/core-testing/LinHES-config/mv_hostype.py +++ b/abs/core-testing/LinHES-config/mv_hostype.py @@ -138,15 +138,15 @@ def hostypeprint(systemconfig): run_mysqlnetwork = True if systemconfig["hostypec"]: setup_db() - install_list=("mysql", "mythdb-initial", "avahi", "portmap", "nfs-utils", "local-website", "myth2ipod", "mythtv-status") - daemon_list=("mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd") + install_list=["mysql", "mythdb-initial", "avahi", "portmap", "nfs-utils", "local-website", "myth2ipod", "mythtv-status"] + daemon_list=["mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd"] elif systemconfig["SystemType"] == "Master_backend": logging.info("Master backend system being configured") setup_ntp(False,"null") setup_avahi(systemconfig["TEMPLATES"]) - install_list=("mysql", "mythdb-initial", "avahi", "portmap", "nfs-utils", "local-website", "myth2ipod", "mythtv-status") - daemon_list=("mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd") + install_list=["mysql", "mythdb-initial", "avahi", "portmap", "nfs-utils", "local-website", "myth2ipod", "mythtv-status"] + daemon_list=["mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd"] EnableNetwork = True run_mysqlnetwork = True if data_config.SYSTEMTYPE == "MythVantage": @@ -160,8 +160,8 @@ def hostypeprint(systemconfig): remove_avahi_service() if systemconfig["hostypec"]: setup_db() - install_list=("portmap", "nfs-utils", "local-website", "avahi", 'libmysqlclient') - daemon_list=("mythbackend", "portmap", "nfs-utils", "netfs", "lighttpd", "avahi") + install_list = ["portmap", "nfs-utils", "local-website", "avahi", "libmysqlclient" ] + daemon_list = ["mythbackend", "portmap", "nfs-utils", "netfs", "lighttpd", "avahi" ] daemon_remove_list=('mysql') if data_config.SYSTEMTYPE == "MythVantage": install_list.remove("local-website") @@ -175,9 +175,9 @@ def hostypeprint(systemconfig): logging.info("Frontend only system being configured") setup_ntp(True,systemconfig["dbhost"]) remove_avahi_service() - install_list=("mysql-clients", "libmysqlclient", "avahi", "portmap", "nfs-utils", "local-website") - remove_list=("mysql") - daemon_list=("mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd") + install_list=["mysql-clients", "libmysqlclient", "avahi", "portmap", "nfs-utils", "local-website"] + remove_list=["mysql"] + daemon_list=["mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd"] daemon_remove_list=("mysql", "mythbackend") if data_config.SYSTEMTYPE == "MythVantage": install_list.remove("local-website") @@ -213,7 +213,7 @@ def hostypeprint(systemconfig): setup_mysql_connection(systemconfig) if data_config.SYSTEMTYPE == "MythVantage": - setup_func_minion(dbhost) + setup_func_minion(systemconfig["dbhost"]) setup_func_key() setup_syslog(systemconfig["dbhost"]) logging.info("__End of hostype config\n") diff --git a/abs/mv-core/MythVantage-config/PKGBUILD b/abs/mv-core/MythVantage-config/PKGBUILD index 60c3dca..8d6766e 100755 --- a/abs/mv-core/MythVantage-config/PKGBUILD +++ b/abs/mv-core/MythVantage-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=MythVantage-config pkgver=3.2 -pkgrel=162 +pkgrel=163 pkgdesc="The Gui-installer" depends=(bc libstatgrab mysql-python expect curl dnsutils parted diff --git a/abs/mv-core/MythVantage-config/mv_hostype.py b/abs/mv-core/MythVantage-config/mv_hostype.py index e7e14cb..5d033fa 100755 --- a/abs/mv-core/MythVantage-config/mv_hostype.py +++ b/abs/mv-core/MythVantage-config/mv_hostype.py @@ -138,15 +138,15 @@ def hostypeprint(systemconfig): run_mysqlnetwork = True if systemconfig["hostypec"]: setup_db() - install_list=("mysql", "mythdb-initial", "avahi", "portmap", "nfs-utils", "local-website", "myth2ipod", "mythtv-status") - daemon_list=("mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd") + install_list=["mysql", "mythdb-initial", "avahi", "portmap", "nfs-utils", "local-website", "myth2ipod", "mythtv-status"] + daemon_list=["mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd"] elif systemconfig["SystemType"] == "Master_backend": logging.info("Master backend system being configured") setup_ntp(False,"null") setup_avahi(systemconfig["TEMPLATES"]) - install_list=("mysql", "mythdb-initial", "avahi", "portmap", "nfs-utils", "local-website", "myth2ipod", "mythtv-status") - daemon_list=("mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd") + install_list=["mysql", "mythdb-initial", "avahi", "portmap", "nfs-utils", "local-website", "myth2ipod", "mythtv-status"] + daemon_list=["mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd"] EnableNetwork = True run_mysqlnetwork = True if data_config.SYSTEMTYPE == "MythVantage": @@ -160,8 +160,8 @@ def hostypeprint(systemconfig): remove_avahi_service() if systemconfig["hostypec"]: setup_db() - install_list=("portmap", "nfs-utils", "local-website", "avahi", 'libmysqlclient') - daemon_list=("mythbackend", "portmap", "nfs-utils", "netfs", "lighttpd", "avahi") + install_list = ["portmap", "nfs-utils", "local-website", "avahi", "libmysqlclient" ] + daemon_list = ["mythbackend", "portmap", "nfs-utils", "netfs", "lighttpd", "avahi" ] daemon_remove_list=('mysql') if data_config.SYSTEMTYPE == "MythVantage": install_list.remove("local-website") @@ -175,9 +175,9 @@ def hostypeprint(systemconfig): logging.info("Frontend only system being configured") setup_ntp(True,systemconfig["dbhost"]) remove_avahi_service() - install_list=("mysql-clients", "libmysqlclient", "avahi", "portmap", "nfs-utils", "local-website") - remove_list=("mysql") - daemon_list=("mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd") + install_list=["mysql-clients", "libmysqlclient", "avahi", "portmap", "nfs-utils", "local-website"] + remove_list=["mysql"] + daemon_list=["mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd"] daemon_remove_list=("mysql", "mythbackend") if data_config.SYSTEMTYPE == "MythVantage": install_list.remove("local-website") -- cgit v0.12