LinHES config: several changes here

- added  modules config_xml   calling this will setup config.xml for mythtv and root user
- install_db_chroot.sh will now generate the default settings and load them into a table
- mv_install now calles myth_settings_wrapper.sh to load the default db

1 files changed, 19 insertions, 4 deletions

diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index aa895da..338e5dc 100755
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -1563,6 +1563,13 @@ def full_install(hostoptions):
 
     restore_default_settings() #also calls copy_updates, fix permissions
 
+    #setup symlink
+    mount_bind_chroot()
+    logging.info("Running systemconfig in chroot")
+    cmd = "chroot %s %s/bin/systemconfig.sh config_xml,this_is_install" %(data_config.MOUNTPOINT, MVROOT)
+    umount_bind_chroot()
+
+
     mount_bind_chroot()
     apply_new_auth()
     umount_bind_chroot()
@@ -1596,14 +1603,16 @@ def full_install(hostoptions):
     else:
         logging.info("______No database required,  continuing configuration________")
         mount_bind_chroot()
-        cmd = "chroot %s DISPLAY=127.0.0.1:0 %s/bin/MythVantage -t restore, default 1" %(data_config.MOUNTPOINT, MVROOT)
-        runcmd(cmd)
-        move_myth_home("backup")
+        #cmd = "chroot %s DISPLAY=127.0.0.1:0 %s/bin/MythVantage -t restore, default 1" %(data_config.MOUNTPOINT, MVROOT)
+        #runcmd(cmd)
+
+
+        #move_myth_home("backup")
         if systemconfig["SystemType"] == "Slave_backend":
             double_mount()
         else:
             double_mount(fe_only=True)
-        move_myth_home("restore")
+        #move_myth_home("restore")
 #       Need to check for to touch  /tmp/.dbsysfailed
         #cmd = "  chroot %s %s/bin/myth_settings_wrapper.sh -c restore  -t syssettings " %(data_config.MOUNTPOINT, MVROOT)
         #runcmd(cmd)
@@ -1615,8 +1624,14 @@ def full_install(hostoptions):
             rc = runcmd(cmd)[0]
             if rc != 0 :
                 error_out("Running systemconfig")
+
+            #restore defaults here!
+            cmd = "chroot %s %s/bin/myth_settings_wrapper.sh -c restore  -t distro_default " %(data_config.MOUNTPOINT, MVROOT)
+            runcmd(cmd)
+
             cmd = "chroot %s %s/bin/myth_settings_wrapper.sh -c restore  -t syssettings " %(data_config.MOUNTPOINT, MVROOT)
             runcmd(cmd)
+
             cmd = "chroot %s %s/bin/myth_settings_wrapper.sh -c ACCESSCONTROL " %(data_config.MOUNTPOINT, MVROOT)
             runcmd(cmd)
         umount_bind_chroot()