@@ -24,6 +24,7 @@ from windowstringreader import WindowStringReader

 from jsonwrapper import JsonWrapper

 from selectdisk import SelectDisk

 from license import License

+import random

 class IsoInstaller(object):

@@ -113,13 +114,15 @@ class IsoInstaller(object):

         # This represents the installer screen, the bool indicated if I can go back to this window or not

         items = []

         if not ks_config:

+            random_hostname = "photon-" + '%12x' % random.randrange(16**12)

             install_config = {'iso_system': False}

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

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

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

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

                 'Hostname:', 

-                2, install_config)

+                2, install_config,

+                random_hostname)

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

                 'Root password:', 

                 2, install_config)

@@ -25,13 +25,29 @@ from windowstringreader import WindowStringReader

 from window import Window

 from actionresult import ActionResult

 from installer import Installer

+from menu import Menu

 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)

+    

+        self.win_height = 13

+        self.win_width = 50

+        self.menu_starty = self.starty + 3    

+        self.ostree_host_menu_items = []

+        self.ostree_host_menu_items.append(("Default RPM-OSTree Server", self.default_installation, []))

+        self.ostree_host_menu_items.append(("Custom RPM-OSTree Server", self.custom_installation, []))

+        self.host_menu = Menu(self.menu_starty,  self.maxx, self.ostree_host_menu_items)

+        self.window = Window(self.win_height, self.win_width, self.maxy, self.maxx, 'Select OSTree Server', True, self.host_menu)

+        self.default_repo = True

+

+    def default_installation(self,  selected_item_params):

+        self.default_repo = True

+        return ActionResult(True, None)

-    def get_ostree_repo_url(self):

+    def custom_installation(self,  selected_item_params):

+        self.default_repo = False

         success = False

         while not success:

             got_the_url = False

@@ -42,7 +58,7 @@ class OstreeInstaller(Installer):

                     "Please provide the URL of OSTree repo",

                     "OSTree Repo URL:", 2,

                     self.install_config,

-                    "https://dl.bintray.com/vmware/photon/rpms/dev/")

+                    "https://dl.bintray.com/vmware/photon/rpm-ostree/dev/x86_64/minimal")

                 ret = ostree_url_reader.get_user_string(None)

                 self.ostree_repo_url = ret.result

@@ -62,6 +78,9 @@ class OstreeInstaller(Installer):

         return ActionResult(True, None)

+    def get_ostree_repo_url(self):

+        return self.window.do_action()

+

     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")

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

         for install_option in options:

             if install_option[0] == config_type:

                 if install_option[1]["include"] != "none":

-                    for include_type in install_option[1]["include"].split(','):

+                    for include_type in install_option[1]["include"]:

                         package_list = package_list + PackageSelector.get_packages_to_install(options, include_type, output_data_path)

                 json_wrapper_package_list = JsonWrapper(os.path.join(output_data_path, install_option[1]["file"]))

                 package_list_json = json_wrapper_package_list.read()