summaryrefslogtreecommitdiffstats
path: root/abs/core/LinHES-config
diff options
context:
space:
mode:
authorCecil <knoppmyth@gmail.com>2011-12-22 01:57:32 (GMT)
committerCecil <knoppmyth@gmail.com>2011-12-22 01:57:32 (GMT)
commit7c37daf6c751f73b0785bc6b851c7cc662f65447 (patch)
treec46d56f3c3c283dc3de31577befbea1ec9ed1bcf /abs/core/LinHES-config
parent69701681f4cd221164da333d0ef0f1baf99bbf52 (diff)
parent02750b0fe64c4da69ff0dfc16178f1a79cec0b18 (diff)
downloadlinhes_pkgbuild-7c37daf6c751f73b0785bc6b851c7cc662f65447.zip
linhes_pkgbuild-7c37daf6c751f73b0785bc6b851c7cc662f65447.tar.gz
linhes_pkgbuild-7c37daf6c751f73b0785bc6b851c7cc662f65447.tar.bz2
Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_pkgbuild into testing
Diffstat (limited to 'abs/core/LinHES-config')
-rw-r--r--abs/core/LinHES-config/PKGBUILD4
-rwxr-xr-xabs/core/LinHES-config/systemconfig.py8
2 files changed, 9 insertions, 3 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index b373509..21b1614 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.3
-pkgrel=54
+pkgrel=55
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -133,6 +133,6 @@ md5sums=('f6bca2af75ddb0902f0fa9ff4b6e4fd7'
'f0988a801216b44c96bf17e24a23e3a9'
'23d0e12b7ca1cc6ea6b993c1d7ff20b9'
'bce31dc826812d1b32003f77f9945ca9'
- '892ba04c504b9be04b2573d015382eae'
+ '59dd4d49fd92a35f4111aa9b77fa21b6'
'2596460462cf6c889cf8f95485537b20'
'a63ff9ef5250965aeabc74bfa8e43981')
diff --git a/abs/core/LinHES-config/systemconfig.py b/abs/core/LinHES-config/systemconfig.py
index aa94aec..a8bae81 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 }
+ 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}
try:
opts, args = getopt.getopt(argv, 'c:hm:d:', ["help","modules" ] )
except getopt.GetoptError, why:
@@ -114,6 +114,12 @@ def main(argv):
logging.debug(" Setting the frontend to restart due to network change")
cmdmodule["restartfe"] = True
+ if cmdmodule["func"]:
+ from mv_hostype import setup_func_minion
+ setup_func_minion(systemconfig.get("dbhost"),systemconfig.get("hostname"))
+
+
+
if cmdmodule["hostype"]:
import mv_hostype