From 81cf4710b9ea364fe00a20acabd5a7a3821067cd Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 15 Mar 2017 18:06:36 +0000
Subject: LinHES-config: mv_hostype.py: always run mythwelcome-config.py

mythwelcome-config.py now checks if mythwelcome is enabled.
---
 abs/core/LinHES-config/PKGBUILD      | 4 ++--
 abs/core/LinHES-config/mv_hostype.py | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 6019c82..2032b7d 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=8.4.3
-pkgrel=4
+pkgrel=5
 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'
@@ -175,7 +175,7 @@ md5sums=('fe70208a7c11f7e2115655ad0004ddaf'
          'fe5e31b833cc6707209e9d656b6eb53c'
          '336f08aed2e3c0b9fd09563933d54735'
          '68ca2af6fb9dba32ed668b9ae1564a01'
-         '38665330aeb3a8bdf7be24857fe035bb'
+         '8be8ce5f1d8522b1cde12d34840865c2'
          '80685e047993b00161be29e3580f3a40'
          '0e1c98392887b6efcb3f8b04ead7c4f9'
          '3cb673adb83b6afa52cffaa621b9d96b'
diff --git a/abs/core/LinHES-config/mv_hostype.py b/abs/core/LinHES-config/mv_hostype.py
index 880c0b9..2d4644d 100755
--- a/abs/core/LinHES-config/mv_hostype.py
+++ b/abs/core/LinHES-config/mv_hostype.py
@@ -351,10 +351,9 @@ def hostypeprint(systemconfig):
         if data_config.SYSTEMTYPE == "MythVantage":
             mv_common.remove_service("ghosd")
 
-    if systemconfig.get("UseMythWelcome") == "1":
-        logging.debug("   Running mythwelcome-config.py")
-        cmd="/usr/LH/bin/mythwelcome-config.py"
-        mv_common.runcmd(cmd)
+    logging.debug("   Running mythwelcome-config.py")
+    cmd="/usr/LH/bin/mythwelcome-config.py"
+    mv_common.runcmd(cmd)
 
     if restart_mbe == True :
         setup_mysql_connection(systemconfig)
-- 
cgit v0.12

