diff options
Diffstat (limited to 'abs/core-testing/LinHES-config/mv_install.py')
| -rwxr-xr-x | abs/core-testing/LinHES-config/mv_install.py | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/abs/core-testing/LinHES-config/mv_install.py b/abs/core-testing/LinHES-config/mv_install.py index 83563aa..1281932 100755 --- a/abs/core-testing/LinHES-config/mv_install.py +++ b/abs/core-testing/LinHES-config/mv_install.py @@ -463,21 +463,21 @@ def create_fstab(extralines): fstabfile = data_config.MOUNTPOINT+"/etc/fstab" fstab_list = [] f = open(fstabfile, 'w') - line = "# <file system> <dir> <type> <options> <dump> <pass> \n" + line = '''# <file system> <dir> <type> <options> <dump> <pass> \n''' fstab_list.append(line) - line = "none /dev/pts devpts defaults 0 0 \n" + line = '''none /dev/pts devpts defaults 0 0 \n''' fstab_list.append(line) - line = "none /dev/shm tmpfs defaults 0 0\n" + line = '''none /dev/shm tmpfs defaults 0 0\n''' fstab_list.append(line) - line = "/dev/cdrom /media/cdrom auto ro, user, noauto, unhide 0 0\n" + line = '''/dev/cdrom /media/cdrom auto ro,user,noauto,unhide 0 0\n''' fstab_list.append(line) - line = "/dev/dvd /media/dvd auto ro, user, noauto, unhide 0 0\n" + line = '''/dev/dvd /media/dvd auto ro,user,noauto,unhide 0 0\n''' fstab_list.append(line) - line = "UUID=ROOTUID / auto defaults, noatime 0 1\n" + line = '''UUID=ROOTUID / auto defaults,noatime 0 1\n''' fstab_list.append(line) - line = "UUID=DATAUID %s auto defaults, noatime 0 1\n" %(data_config.DATAMOUNT) + line = '''UUID=DATAUID %s auto defaults,noatime 0 1\n''' %(data_config.DATAMOUNT) fstab_list.append(line) - line = "UUID=SWAPUID swap swap defaults 0 0 \n" + line = '''UUID=SWAPUID swap swap defaults 0 0 \n''' fstab_list.append(line) for vline in extralines: fstab_list.append(vline) @@ -848,7 +848,8 @@ def full_install(hostoptions): cmd = " chroot %s %s/bin/install_db_chroot.sh |tee /tmp/chrootdb.out" %(data_config.MOUNTPOINT, MVROOT) runcmd(cmd) logging.info("Running systemconfig in chroot") - cmd = " chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT) + #cmd = " chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT) + cmd = " chroot %s %s/bin/systemconfig.sh all , this_is_install" %(data_config.MOUNTPOINT, MVROOT) runcmd(cmd) mysqldb("stop", "chroot") kill_dhcp_chroot() @@ -866,13 +867,14 @@ def full_install(hostoptions): if ( 'x' == '1' ): logging.debug("touching /tmp/.dbsysfailed") else: - cmd = " chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT) + #cmd = " chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT) + cmd = " chroot %s %s/bin/systemconfig.sh all , this_is_install" %(data_config.MOUNTPOINT, MVROOT) runcmd(cmd) cmd = " chroot %s %s/bin/restore_default_settings.sh -c ACCESSCONTROL " %(data_config.MOUNTPOINT, MVROOT) runcmd(cmd) umount_bind_chroot() - cmd = " chroot %s %s/bin/systemconfig.sh advanced, user" %(data_config.MOUNTPOINT, MVROOT) - runcmd(cmd) + #cmd = " chroot %s %s/bin/systemconfig.sh advanced, user" %(data_config.MOUNTPOINT, MVROOT) + #runcmd(cmd) cmd = " touch %s%s/.configure" %(data_config.MOUNTPOINT, data_config.MYTHHOME) runcmd(cmd) cmd = " chmod 777 %s%s/.configure" %(data_config.MOUNTPOINT, data_config.MYTHHOME) @@ -1069,7 +1071,8 @@ def upgrade(hostoptions): fix_permissions() mount_bind_chroot() logging.info("Running systemconfig in chroot") - cmd = " chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT) + #cmd = " chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT) + cmd = " chroot %s %s/bin/systemconfig.sh all , this_is_install" %(data_config.MOUNTPOINT, MVROOT) runcmd(cmd) mysqldb("stop", "") if ( systemconfig["SystemType"] == "Master_backend" or systemconfig["SystemType"] == "Standalone" ): @@ -1095,11 +1098,12 @@ def upgrade(hostoptions): runcmd(cmd) logging.info("Running systemconfig in chroot 2nd time") - cmd = " chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT) - runcmd(cmd) - logging.info("Running systemconfig in chroot") - cmd = " chroot %s %s/bin/systemconfig.sh advanced" %(data_config.MOUNTPOINT, MVROOT) + #cmd = " chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT) + cmd = " chroot %s %s/bin/systemconfig.sh all , this_is_install" %(data_config.MOUNTPOINT, MVROOT) runcmd(cmd) + #logging.info("Running systemconfig in chroot") + #cmd = " chroot %s %s/bin/systemconfig.sh advanced" %(data_config.MOUNTPOINT, MVROOT) + #runcmd(cmd) mysqldb("stop", 'chroot') apply_new_auth() kill_dhcp_chroot() |