LinHES-config: fixed several install problems

- new grub install
- fix detection of ip in python scripts
- fix xscreensaver not starting after install
- fix force umount of /new_boot

1 files changed, 20 insertions, 10 deletions

diff --git a/abs/core/LinHES-config/mv_hostype.py b/abs/core/LinHES-config/mv_hostype.py
index 59b05b6..2f2ceab 100755
--- a/abs/core/LinHES-config/mv_hostype.py
+++ b/abs/core/LinHES-config/mv_hostype.py
@@ -260,7 +260,7 @@ def hostypeprint(systemconfig):
     daemon_list=''
     daemon_remove_list=''
     run_mysqlnetwork = False
-
+    restart_mbe = False
     profile_status="/etc/profile.d/z_myth_status.sh"
     myth_status="/usr/LH/bin/myth_status.sh"
 
@@ -271,9 +271,12 @@ def hostypeprint(systemconfig):
         EnableNetwork = False
         run_mysqlnetwork = True
         if systemconfig.get("hostypec"):
-            setup_db()
+            logging.info(" Host type change detected, queuing restart of backend")
+            restart_mbe = True
+
+
         install_list=["nss-mdns", "mysql", "mythdb-initial", "avahi", "rpcbind", "nfs-utils", "local-website", "myth2ipod", "mythtv-status"]
-        daemon_list=["mysql", "mythbackend", "avahi", "rpcbind", "nfs-common", "netfs", "lighttpd"]
+        daemon_list=["mysql", "mythbackend", "avahi", "rpcbind", "nfs-common", "netfs", "lighttpd" ,"msg_daemon"]
 
 
         mv_common.link_file(myth_status,profile_status)
@@ -290,7 +293,7 @@ def hostypeprint(systemconfig):
         setup_ntp(False,"null")
         setup_avahi(systemconfig.get("TEMPLATES"))
         install_list=["nss-mdns", "mysql", "mythdb-initial", "avahi", "rpcbind", "nfs-utils", "local-website", "myth2ipod", "mythtv-status"]
-        daemon_list=["mysql", "mythbackend", "avahi", "rpcbind", "nfs-common", "netfs", "lighttpd"]
+        daemon_list=["mysql", "mythbackend", "avahi", "rpcbind", "nfs-common", "netfs", "lighttpd" ,"msg_daemon"]
         EnableNetwork = True
         run_mysqlnetwork = True
         mv_common.link_file(myth_status,profile_status)
@@ -303,6 +306,9 @@ def hostypeprint(systemconfig):
             install_list.append('certmaster')
             daemon_list.append('certmaster')
 
+        if systemconfig.get("hostypec"):
+            logging.info(" Host type change detected, queuing restart of backend")
+            restart_mbe = True
 
     elif systemconfig.get("SystemType") == "Slave_backend":
         logging.info("Slave backend  system being configured")
@@ -310,10 +316,8 @@ def hostypeprint(systemconfig):
         remove_avahi_service()
         mv_common.link_file(myth_status,profile_status)
 
-        if systemconfig.get("hostypec"):
-            setup_db()
         install_list = [ "nss-mdns", "rpcbind", "nfs-utils", "avahi", "libmysqlclient" ]
-        daemon_list = ["mythbackend", "rpcbind", "nfs-common", "netfs", "avahi" ]
+        daemon_list = ["mythbackend", "rpcbind", "nfs-common", "netfs", "avahi" ,"msg_daemon" ]
 
         daemon_remove_list=["mysql", "lighttpd", "certmaster"]
 
@@ -326,6 +330,9 @@ def hostypeprint(systemconfig):
             daemon_list.append('xymon-client')
 
         setup_rsyslog_client(systemconfig.get("dbhost"))
+        if systemconfig.get("hostypec"):
+            logging.info(" Host type change detected, queuing restart of backend")
+            restart_mbe = True
 
 
     elif systemconfig.get("SystemType") == "Frontend_only":
@@ -335,7 +342,7 @@ def hostypeprint(systemconfig):
         install_list=["mysql-clients", "libmysqlclient",  "avahi", "rpcbind", "nfs-utils"]
         remove_list=["mysql","lighttpd"]
 
-        daemon_list=["nss-mdns",  "mysql", "mythbackend", "avahi", "rpcbind", "nfs-common", "netfs" ]
+        daemon_list=["nss-mdns",  "mysql", "mythbackend", "avahi", "rpcbind", "nfs-common", "netfs" ,"msg_daemon"]
         daemon_remove_list=["mysql", "mythbackend","lighttpd"]
         if xymon_supported:
             install_list.append('xymonclient')
@@ -361,16 +368,19 @@ def hostypeprint(systemconfig):
     if systemconfig.get("RunFrontend") == "1":
         logging.debug("   Will run the frontend")
         mv_common.add_service("frontend")
-        mv_common.add_service("hal")
+        #mv_common.add_service("hal")
         if data_config.SYSTEMTYPE == "MythVantage":
             mv_common.add_service("ghosd")
     else:
         logging.debug("   Will NOT run the frontend")
         mv_common.remove_service("frontend")
-        mv_common.add_service("hal")
+        #mv_common.add_service("hal")
         if data_config.SYSTEMTYPE == "MythVantage":
             mv_common.remove_service("ghosd")
 
+    if restart_mbe == True :
+        mv_common.restart_service("mythbackend")
+
 
     if run_mysqlnetwork:
         setup_mysqlnetwork(EnableNetwork)