@@ -30,7 +30,7 @@

         "visible" : true,

         "include" : "none"

     },

-    "ostree_host" : {

+    "ostree_server" : {

         "title" : "5. Photon OSTree Server",

         "file" : "packages_ostree_server.json",

         "visible" : true,

@@ -14,7 +14,12 @@

                 "gptfdisk", "gzip", "openssl", "python2", "python2-libs", "python-requests",

                 "pcre",

                 "libgsystem", "ostree","device-mapper","device-mapper-libs","libsepol","libselinux", 

-                "db", "libsolv", "hawkey", "python-hawkey"]

+                "db", "libsolv",

+                "dracut", "dracut-tools",

+                "gpgme", "gpgme-devel", "hawkey", "python-hawkey", "json-glib", "glib",

+                "libarchive", "libarchive-devel", "libassuan", "libffi",

+                "libgpg-error", "libhif", "libhif-devel",

+                "librepo", "librepo-devel", "libsoup", "libsoup-devel",

+                "libxml2", "mkinitcpio", "openssl-devel",

+                "yum", "ostree"]

 }

-

-

@@ -2,17 +2,14 @@

     "packages":["glibc","zlib", "filesystem",

                 "gmp", "mpfr", "libgcc", "libstdc++",

                 "bzip2", "pkg-config", "ncurses", "cracklib", "cracklib-dicts", "shadow", "procps-ng", "e2fsprogs",

-                "iana-etc", "readline", "coreutils", "bash", "bc", "libtool",

+                "iana-etc", "readline", "coreutils", "bash",

                 "inetutils",

-                "xz", "grub2", "iproute2", "kbd", "kmod", "libpipeline",

+                "xz", "iproute2", "kbd", "kmod", "libpipeline",

                 "util-linux",

                 "openssl", "libffi", "expat",

-                "linux", "curl",

-                "iptables", "ca-certificates",

-                "Linux-PAM", "attr", "libcap", "systemd", "dbus",

-                "sqlite-autoconf", "elfutils-libelf", "elfutils-libelf-devel",

-                "nspr", "nss", "popt", "lua", "rpm", "openssh",

-                "db", "libsolv", "libgpg-error", "hawkey", "libassuan", "gpgme", "librepo", "pcre", "glib", "tdnf",

+                "linux", "glib",

+                "iptables", "ca-certificates", "pcre",

+                "Linux-PAM", "attr", "libcap", "systemd", "dbus", "docker",

                 "photon-release"

                 ]

 }

new file mode 100644

@@ -0,0 +1,4 @@

+{

+    "packages":[]

+}

+

@@ -1,6 +1,6 @@

 {

-    "packages":["bash", "bzip2", "dracut", "dracut-tools",

-                "glib", "glibc", "gpgme", "gpgme-devel", "hawkey", "json-glib",

+    "packages":["filesystem", "glibc", "bash", "bzip2", "dracut", "dracut-tools",

+                "glib", "gpgme", "gpgme-devel", "hawkey", "json-glib",

                 "libarchive", "libarchive-devel", "libassuan", "libcap", "libffi",

                 "libgcc", "libgpg-error", "libgsystem", "libhif", "libhif-devel",

                 "librepo", "librepo-devel", "libsolv", "libsoup", "libsoup-devel",

@@ -335,3 +335,13 @@ class Installer(object):

                 print >> sys.stderr,  "Error: not able to execute module %s" % module

                 continue

             mod.execute(module, self.ks_config, self.install_config, self.photon_root)

+

+    def run(self, command, comment = None):

+        if comment != None:

+            print >> sys.stderr, "Installer: {} ".format(comment)

+            self.progress_bar.show_loading(comment)

+

+        print >> sys.stderr, "Installer: {} ".format(command)

+        process = subprocess.Popen([command], shell=True, stdout=self.output)

+        retval = process.wait()

+        return retval

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,30 @@

+#! /usr/bin/python2

+#

+#    Copyright (C) 2015 vmware inc.

+#

+#    Author: Touseef Liaqat <tliaqat@vmware.com>

+

+from installer import Installer

+from ostreeinstaller import OstreeInstaller

+from ostreeserverinstaller import OstreeServerInstaller

+

+class InstallerContainer(object):

+    def __init__(self, install_config, maxy = 0, maxx = 0, iso_installer = False, rpm_path = "../stage/RPMS", log_path = "../stage/LOGS", ks_config = None):

+        self.install_config = install_config

+        self.maxy = maxy

+        self.maxx = maxx

+        self.ks_config = ks_config

+        self.iso_installer = iso_installer

+        self.rpm_path = rpm_path

+        self.log_path = log_path

+

+    def install(self, params):

+        installer = None

+        if self.install_config['type'] == "ostree_host":

+            installer = OstreeInstaller(self.install_config, self.maxy, self.maxx, self.iso_installer, self.rpm_path, self.log_path, self.ks_config)

+        elif self.install_config['type'] == "ostree_server":

+            installer = OstreeServerInstaller(self.install_config, self.maxy, self.maxx, self.iso_installer, self.rpm_path, self.log_path, self.ks_config)

+        else:

+            installer = Installer(self.install_config, self.maxy, self.maxx, self.iso_installer, self.rpm_path, self.log_path, self.ks_config)

+

+        return installer.install(params)

\ No newline at end of file

@@ -18,6 +18,8 @@ from diskpartitioner import DiskPartitioner

 from packageselector import PackageSelector

 from custompackageselector import CustomPackageSelector

 from installer import Installer

+from installercontainer import InstallerContainer

+from ostreeinstaller import OstreeInstaller

 from windowstringreader import WindowStringReader

 from jsonwrapper import JsonWrapper

 from selectdisk import SelectDisk

@@ -116,13 +118,13 @@ class IsoInstaller(object):

             license_agreement = License(self.maxy, self.maxx)

             select_disk = SelectDisk(self.maxy, self.maxx, self.install_config)

             package_selector = PackageSelector(self.maxy, self.maxx, self.install_config, options_file)

-            hostname_reader = WindowStringReader(self.maxy, self.maxx, 10, 70, False, False, 'Choose the hostname for your system',

+            hostname_reader = WindowStringReader(self.maxy, self.maxx, 10, 70, 'hostname', False, 'Choose the hostname for your system',

                 'Hostname:', 

                 2, self.install_config)

-            root_password_reader = WindowStringReader(self.maxy, self.maxx, 10, 70, True, False,  'Set up root password',

+            root_password_reader = WindowStringReader(self.maxy, self.maxx, 10, 70, 'password', False,  'Set up root password',

                 'Root password:', 

                 2, self.install_config)

-            confirm_password_reader = WindowStringReader(self.maxy, self.maxx, 10, 70, True, True,  'Confirm root password',

+            confirm_password_reader = WindowStringReader(self.maxy, self.maxx, 10, 70, 'password', True,  'Confirm root password',

                 'Confirm Root password:', 

                 2, self.install_config)

@@ -134,7 +136,8 @@ class IsoInstaller(object):

                     (root_password_reader.get_user_string, True),

                     (confirm_password_reader.get_user_string, False),

                  ]

-        installer = Installer(self.install_config, self.maxy, self.maxx, True, rpm_path=rpm_path, log_path="/var/log", ks_config=ks_config)

+        installer = InstallerContainer(self.install_config, self.maxy, self.maxx, True, rpm_path=rpm_path, log_path="/var/log", ks_config=ks_config)

+

         items = items + [(installer.install, False)]

         index = 0

new file mode 100755

@@ -0,0 +1,25 @@

+#!/bin/bash

+#################################################

+#       Title:  mk-ostree-server                  #

+#        Date:  2015-07-15                      #

+#     Version:  1.0                             #

+#      Author:  tliaqat@vmware.com             #

+#     Options:                                  #

+#################################################

+#   Overview

+#       Install OSTree Server

+#   End

+#

+

+set -o errexit          # exit if error...insurance ;)

+set -o nounset          # exit if variable not initalized

+set +h                  # disable hashall

+PRGNAME=${0##*/}        # script name minus the path

+source config.inc       #   configuration parameters

+source function.inc     #   commonn functions

+LOGFILE=/var/log/"${PRGNAME}-${LOGFILE}"    #   set log file name

+

+ROOT=$1

+

+ostree --repo=${ROOT}/srv/rpm-ostree/repo init --mode=archive-z2 >> "${LOGFILE}" 2>&1

+rpm-ostree compose tree --repo=${ROOT}/srv/rpm-ostree/repo photon-base.json >> "${LOGFILE}" 2>&1

@@ -31,4 +31,5 @@ def execute(name, ks_config, config, root):

     else:

         #add password hash in shadow file

         commons.replace_string_in_file(shadow_filename, "root::", "root:"+shadow_password+":")

+        commons.replace_string_in_file(shadow_filename, "root:x:", "root:"+shadow_password+":")

new file mode 100644

@@ -0,0 +1,177 @@

+#!/usr/bin/python2

+#

+#    Copyright (C) 2015 vmware inc.

+#

+#    Author: Touseef Liaqat <tliaqat@vmware.com>

+

+import subprocess

+import curses

+import os

+import crypt

+import re

+import random

+import string

+import shutil

+import fnmatch

+import signal

+import sys

+import glob

+import urllib

+import modules.commons

+import xml.etree.ElementTree as ET

+from jsonwrapper import JsonWrapper

+from progressbar import ProgressBar

+from windowstringreader import WindowStringReader

+from window import Window

+from actionresult import ActionResult

+from installer import Installer

+

+class OstreeInstaller(Installer):

+

+    def __init__(self, install_config, maxy = 0, maxx = 0, iso_installer = False, rpm_path = "../stage/RPMS", log_path = "../stage/LOGS", ks_config = None):

+        Installer.__init__(self, install_config, maxy, maxx, iso_installer, rpm_path, log_path, ks_config)

+

+    def get_ostree_repo_url(self):

+        success = False

+        while not success:

+            got_the_url = False

+            while not got_the_url:

+                ostree_url_reader = WindowStringReader(

+                    self.maxy, self.maxx, 10, 70,

+                    "ostree_repo_url", False,

+                    "Please provide the URL of OSTree repo",

+                    "OSTree Repo URL:", 2,

+                    self.install_config,

+                    "http://192.168.29.166/")

+

+                ret = ostree_url_reader.get_user_string(None)

+                self.ostree_repo_url = ret.result

+                got_the_url = ret.success

+

+            ostree_ref_reader = WindowStringReader(self.maxy,

+                self.maxx, 10, 70,

+                "ostree_ref", False,

+                "Please provide the Ref in OSTree repo",

+                "OSTree Repo Ref:", 2,

+                self.install_config,

+                "tp2/x86_64/minimal")

+

+            ret = ostree_ref_reader.get_user_string(None)

+            self.ostree_ref = ret.result

+            success = ret.success

+

+        return ActionResult(True, None)

+

+    def deploy_ostree(self, repo_url, repo_ref):

+        self.run("ostree admin --sysroot={} init-fs {}".format(self.photon_root, self.photon_root), "Initializing OSTree filesystem")

+        self.run("ostree remote add --repo={}/ostree/repo --set=gpg-verify=false photon {}".format(self.photon_root, repo_url), "Adding OSTree remote")

+        self.run("ostree pull --repo={}/ostree/repo photon {}".format(self.photon_root, repo_ref), "Pulling OSTree remote repo")

+        self.run("ostree admin --sysroot={} os-init photon ".format(self.photon_root), "OSTree OS Initializing")

+        self.run("ostree admin --sysroot={} deploy --os=photon photon/{}".format(self.photon_root, repo_ref), "Deploying")

+

+    def do_systemd_tmpfiles_commands(self, commit_number):

+        prefixes = ["/var/home",

+            "/var/roothome",

+            "/var/lib/rpm",

+            "/var/opt",

+            "/var/srv",

+            "/var/userlocal",

+            "/var/mnt",

+            "/var/spool/mail"]

+

+        for prefix in prefixes:

+            command = "systemd-tmpfiles --create --boot --root={}/ostree/deploy/photon/deploy/{}.0 --prefix={}".format(self.photon_root, commit_number, prefix)

+            self.run(command)

+

+    def mount_devices_in_deployment(self, commit_number):

+        for command in ["mount -t bind -o bind,defaults /dev  {}/ostree/deploy/photon/deploy/{}.0/dev",

+            "mount -t devpts -o gid=5,mode=620 devpts  {}/ostree/deploy/photon/deploy/{}.0/dev/pts",

+            "mount -t tmpfs -o defaults tmpfs  {}/ostree/deploy/photon/deploy/{}.0/dev/shm",

+            "mount -t proc -o defaults proc  {}/ostree/deploy/photon/deploy/{}.0/proc",

+            "mount -t bind -o bind,defaults /run  {}/ostree/deploy/photon/deploy/{}.0/run",

+            "mount -t sysfs -o defaults sysfs  {}/ostree/deploy/photon/deploy/{}.0/sys" ]:

+            self.run(command.format(self.photon_root, commit_number))

+

+    def get_commit_number(self, ref):

+        fileName = os.path.join(self.photon_root, "ostree/repo/refs/remotes/photon/{}".format(ref))

+        commit_number = None

+        with open (fileName, "r") as file:

+            commit_number = file.read().replace('\n', '')

+        return commit_number

+

+    def unsafe_install(self, params):

+        self.org_photon_root = self.photon_root

+        sysroot_ostree = os.path.join(self.photon_root, "ostree")

+        sysroot_boot = os.path.join(self.photon_root, "boot")

+        loader0 = os.path.join(sysroot_boot, "loader.0")

+        loader1 = os.path.join(sysroot_boot, "loader.1")

+

+        boot0 = os.path.join(sysroot_ostree, "boot.0")

+        boot1 = os.path.join(sysroot_ostree, "boot.1")

+

+        boot01 = os.path.join(sysroot_ostree, "boot.0.1")

+        boot11 = os.path.join(sysroot_ostree, "boot.1.1")

+

+        self.get_ostree_repo_url()

+

+        self.window.show_window()

+        self.progress_bar.initialize("Initializing installation...")

+        self.progress_bar.show()

+

+        self.execute_modules(modules.commons.PRE_INSTALL)

+

+        disk = self.install_config['disk']['disk']

+        self.run("sgdisk -d 2 -n 2::+300M -n 3: -p {}".format(disk), "Updating partition table for OSTree")

+        self.run("mkfs -t ext4 {}2".format(disk))

+        self.run("mkfs -t ext4 {}3".format(disk))

+        self.run("mount {}3 {}".format(disk, self.photon_root))

+        self.run("mkdir -p {} ".format(sysroot_boot))

+        self.run("mount {}2 {}".format(disk, sysroot_boot))

+

+        self.deploy_ostree(self.ostree_repo_url, self.ostree_ref)

+

+        commit_number = self.get_commit_number(self.ostree_ref)

+        self.do_systemd_tmpfiles_commands(commit_number)

+

+        self.mount_devices_in_deployment(commit_number)

+        deployment = os.path.join(self.photon_root, "ostree/deploy/photon/deploy/" + commit_number + ".0/")

+

+        deployment_boot = os.path.join(deployment, "boot")

+        deployment_sysroot = os.path.join(deployment, "sysroot")

+

+        self.run("mv {} {}".format(loader1, loader0))

+        self.run("mv {} {}".format(boot1, boot0))

+        self.run("mv {} {}".format(boot11, boot01))

+        self.run("mount --bind {} {}".format(sysroot_boot, deployment_boot))

+        self.run("mount --bind {} {}".format(self.photon_root, deployment_sysroot))

+        self.run("chroot {} bash -c \"grub2-install /dev/sda\"".format(deployment))

+        self.run("chroot {} bash -c \"grub2-mkconfig -o /boot/grub2/grub.cfg\"".format(deployment))

+        self.run("mv {} {}".format(loader0, loader1))

+        self.run("mv {} {}".format(boot0, boot1))

+        self.run("mv {} {}".format(boot01, boot11))

+        self.run("chroot {} bash -c \"ostree admin instutil set-kargs root=/dev/sda3 \"".format(deployment))

+        sysroot_grub2_grub_cfg = os.path.join(self.photon_root, "boot/grub2/grub.cfg")

+        self.run("ln -sf ../loader/grub.cfg {}".format(sysroot_grub2_grub_cfg))

+        self.run("mv {} {}".format(loader1, loader0))

+        self.run("mv {} {}".format(boot1, boot0))

+        self.run("mv {} {}".format(boot11, boot01))

+

+

+        deployment_fstab = os.path.join(deployment, "etc/fstab")

+        self.run("echo \"/dev/sda2    /boot    ext4   defaults   1 2  \" >> {} ".format(deployment_fstab), "Adding /boot mount point in fstab")

+        self.run("mount --bind {} {}".format(deployment, self.photon_root))

+        self.progress_bar.show_loading("Starting post install modules")

+        self.execute_modules(modules.commons.POST_INSTALL)

+

+        self.run("{} {} {}".format(self.unmount_disk_command, '-w', self.photon_root))

+

+        if self.iso_installer:

+            self.progress_bar.show_loading('Press any key to continue to boot')

+            self.progress_bar.hide()

+            self.window.addstr(0, 0,

+                "Congratulations, Photon has been installed in {} secs.\n\nPress any key to continue to boot...".format(self.progress_bar.time_elapsed))

+            if self.ks_config == None:

+                self.window.content_window().getch()

+

+        return ActionResult(True, None)

+

new file mode 100644

@@ -0,0 +1,43 @@

+#!/usr/bin/python2

+#

+#    Copyright (C) 2015 vmware inc.

+#

+#    Author: Touseef Liaqat <tliaqat@vmware.com>

+

+import subprocess

+import curses

+import os

+import crypt

+import re

+import random

+import string

+import shutil

+import fnmatch

+import signal

+import sys

+import glob

+import urllib

+import modules.commons

+import xml.etree.ElementTree as ET

+from jsonwrapper import JsonWrapper

+from progressbar import ProgressBar

+from windowstringreader import WindowStringReader

+from window import Window

+from actionresult import ActionResult

+from installer import Installer

+

+class OstreeServerInstaller(Installer):

+

+    def __init__(self, install_config, maxy = 0, maxx = 0, iso_installer = False, rpm_path = "../stage/RPMS", log_path = "../stage/LOGS", ks_config = None):

+        Installer.__init__(self, install_config, maxy, maxx, iso_installer, rpm_path, log_path, ks_config)

+

+    def finalize_system(self):

+        Installer.finalize_system(self)

+

+        self.run("mkdir -p {}/srv/rpm-ostree/".format(self.photon_root))

+        self.run("cp *.inc {}/srv/rpm-ostree/".format(self.photon_root))

+        self.run("cp ./mk-ostree-server.sh {}/srv/rpm-ostree/".format(self.photon_root))

+        self.run("cp ./photon-base.json {}/srv/rpm-ostree/".format(self.photon_root))

+        self.run("cp ./photon-ostree.repo {}/srv/rpm-ostree/".format(self.photon_root))

+        self.run("mount /dev/cdrom {}/mnt/cdrom".format(self.photon_root))

+        self.run("chroot {} bash -c \"cd /srv/rpm-ostree; ./mk-ostree-server.sh /\"".format(self.photon_root))

@@ -19,7 +19,7 @@ class PackageSelector(object):

         self.maxx = maxx

         self.maxy = maxy

         self.win_width = 50

-        self.win_height = 10

+        self.win_height = 13

         self.win_starty = (self.maxy - self.win_height) / 2

         self.win_startx = (self.maxx - self.win_width) / 2

new file mode 100644

@@ -0,0 +1,33 @@

+{

+    "comment": "Photon Minimal OSTree",

+

+    "osname": "photon",

+

+    "ref": "tp2/x86_64/minimal",

+

+    "repos": ["photon-ostree"],

+

+    "selinux": false,

+

+    "initramfs-args": ["--no-hostonly"],

+

+    "bootstrap_packages": ["filesystem"],

+

+    "packages": ["glibc", "zlib", "binutils", "gmp", "mpfr", "libgcc", "libstdc++","libgomp",

+                "pkg-config", "ncurses", "bash", "bzip2", "cracklib", "cracklib-dicts", "shadow",

+                "procps-ng", "iana-etc", "readline", "coreutils", "bc", "libtool", "inetutils",

+                "findutils", "xz", "grub2", "iproute2", "util-linux", "linux",

+                "attr", "libcap", "kmod", "expat", "dbus", "file",

+                "sed", "grep", "cpio", "gzip",

+                "wget", "openssl", "ca-certificates", "curl", "iptables", "Linux-PAM",

+                "systemd", "e2fsprogs", "elfutils-libelf", "lua", "popt", "sqlite-autoconf", "nspr", "nss", "rpm",

+                "openssh", "libffi", "gdbm", "python2", "python2-libs", "pcre", "glib", "libxml2",

+                "photon-release",

+                "vim", "db", "libsolv", "libgpg-error", "hawkey", "libassuan", "gpgme", "librepo", "tdnf",

+                "libdnet", "xerces-c", "xml-security-c", "libmspack",

+                "docker","bridge-utils",

+                "libyaml", "PyYAML", "python-requests", "python-prettytable",

+                "python-jsonpointer", "python-jsonpatch", "python-six", "python-configobj",

+                "krb5", "e2fsprogs-devel",

+                "dracut", "dracut-tools", "ostree", "rpm-ostree", "nss-altfiles", "which"]

+}

new file mode 100644

@@ -0,0 +1,7 @@

+[photon-ostree]

+name=VMware Photon Linux 1.0(x86_64)

+baseurl=http://192.168.29.140:8090/

+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY

+gpgcheck=0

+enabled=1

+skip_if_unavailable=True

@@ -9,31 +9,32 @@ import crypt

 import string

 import random

 import cracklib

+import sys

 from actionresult import ActionResult

 from action import Action

 from confirmwindow import ConfirmWindow

 class ReadText(Action):

-    def __init__(self, maxy, maxx, textwin, y, install_config, ispassword, confirm_pass):

+    def __init__(self, maxy, maxx, textwin, y, install_config, field, confirm_pass, default_string = None):

         self.textwin = textwin

         self.maxy = maxy

         self.maxx = maxx

         self.y = y

         self.install_config = install_config

-        self.ispassword = ispassword

+        self.field = field

         self.confirm_pass = confirm_pass;

-        

+        self.default_string = default_string

         self.textwin_width = self.textwin.getmaxyx()[1] - 1

         self.visible_text_width = self.textwin_width - 1

         self.init_text()

-        self.maxlength = 255        

+        self.maxlength = 255

         #initialize the accepted characters

-        if self.ispassword:

+        if self.field == "password":

             # Adding all the letters

             self.accepted_chars = range(33, 127)

-        else:

+        elif self.field == "hostname":

             self.alpha_chars = range(65, 91)

             self.alpha_chars.extend(range(97,123))

@@ -43,7 +44,8 @@ class ReadText(Action):

             self.accepted_chars.extend(range(48, 58))

             # Adding the . and -

             self.accepted_chars.extend([ord('.'), ord('-')])

-

+        else:

+            self.accepted_chars = range(33, 127)

     def hide(self):

         return

@@ -63,6 +65,10 @@ class ReadText(Action):

         self.init_text()

         curses.curs_set(1)

+        if self.default_string != None:

+            self.textwin.addstr(self.y, 0, self.default_string)

+            self.str = self.default_string

+

         while True:

             if len(self.str) > self.visible_text_width:

                 curs_loc = self.visible_text_width

@@ -81,18 +87,21 @@ class ReadText(Action):

                         confrim_window.do_action()

                         return ActionResult(False, {'goBack': True})

                     self.install_config['password'] = self.generate_password_hash(self.str)

-                elif self.ispassword:

+                elif self.field == "password":

                     err = self.validate_password(self.str)

                     if err != self.str:

                         self.init_text()

                         self.textwin.addstr(self.y + 2, 0, "Error: " + err, curses.color_pair(4))

                         continue

                     self.install_config['password'] = self.str;

-                else:

+                elif self.field == "hostname":

                     if not self.validate_hostname(self.str):

                         self.textwin.addstr(self.y + 2, 0, "It should start with alpha char and ends with alpha-numeric char", curses.color_pair(4))

                         continue

                     self.install_config['hostname'] = self.str

+                else:

+                    self.install_config[self.field] = self.str

+                    return ActionResult(True, self.str)

                 curses.curs_set(0)

                 return ActionResult(True, None)

             elif ch in [ord('\t')]:

@@ -113,7 +122,7 @@ class ReadText(Action):

                     text = self.str[-self.visible_text_width:]

                 else:

                     text = self.str

-                if self.ispassword:

+                if self.field == "password":

                     text = '*' * len(text)

                 # Add the dashes

                 text = text + '_' * (self.visible_text_width - len(self.str))

@@ -10,6 +10,7 @@ from actionresult import ActionResult

 from menu import Menu

 from confirmwindow import ConfirmWindow

 import modules.commons

+from progressbar import ProgressBar

 class SelectDisk(object):

     def __init__(self,  maxy, maxx, install_config):

@@ -26,6 +27,9 @@ class SelectDisk(object):

         self.menu_starty = self.win_starty + 6

         self.menu_height = 5

+        self.progress_padding = 5

+        self.progress_width = self.win_width - self.progress_padding

+        self.progress_bar = ProgressBar(self.win_starty + 6, self.win_startx + self.progress_padding / 2, self.progress_width)

         self.window = Window(self.win_height, self.win_width, self.maxy, self.maxx, 'Setup your disk', True)

         self.devices = Device.refresh_devices()

@@ -36,10 +40,14 @@ class SelectDisk(object):

         menu_starty = (self.maxy - menu_height) / 2 + 5

         confrim_window = ConfirmWindow(menu_height, menu_width, self.maxy, self.maxx, menu_starty, 'This will erase the disk.\nAre you sure?')

         confirmed = confrim_window.do_action().result['yes']

-        

+

         if not confirmed:

             return ActionResult(confirmed, None)

-        

+

+        self.progress_bar.initialize('Partitioning...')

+        self.progress_bar.show()

+        self.progress_bar.show_loading('Partitioning')

+

         # Do the partitioning

         self.window.clearerror()

         partitions_data = modules.commons.partition_disk(self.devices[device_index].path)

@@ -48,6 +56,7 @@ class SelectDisk(object):

         else:

             self.install_config['disk'] = partitions_data

+        self.progress_bar.hide()

         return ActionResult(partitions_data != None, None)

     def display(self, params):

@@ -69,7 +78,6 @@ class SelectDisk(object):

         self.disk_menu = Menu(self.menu_starty,  self.maxx, self.disk_menu_items, self.menu_height)

         self.window.set_action_panel(self.disk_menu)

-

         return self.window.do_action()

@@ -9,7 +9,7 @@ from window import Window

 from readtext import ReadText

 class WindowStringReader(object):

-    def __init__(self, maxy, maxx, height, width, ispassword, confirm_password, title, display_string, inputy, install_config):

+    def __init__(self, maxy, maxx, height, width, field, confirm_password, title, display_string, inputy, install_config, default_string = None):

         self.title = title

         self.display_string = display_string

         self.inputy = inputy

@@ -23,7 +23,7 @@ class WindowStringReader(object):

         self.starty = (self.maxy - self.height) / 2

         self.window = Window(self.height, self.width, self.maxy, self.maxx, self.title, True)

-        self.read_text = ReadText(maxy, maxx, self.window.content_window(), self.inputy, install_config, ispassword, confirm_password)

+        self.read_text = ReadText(maxy, maxx, self.window.content_window(), self.inputy, install_config, field, confirm_password, default_string)

         self.window.set_action_panel(self.read_text)

         self.window.addstr(0, 0, self.display_string)

old mode 100755

new mode 100644