@@ -113,6 +113,7 @@ class Installer(object):

         self.initialize_system()

         if self.iso_installer:

+            self.adjust_packages_for_vmware_virt()

             self.get_size_of_packages()

             selected_packages = self.install_config['packages']

             for package in selected_packages:

@@ -381,6 +382,22 @@ class Installer(object):

             self.size_of_packages[package] = size;

         self.progress_bar.update_num_items(progressbar_num_items)

+    def adjust_packages_for_vmware_virt(self):

+        try:

+            if (self.install_config['vmware_virt'] and

+                self.install_config['install_linux_esx']):

+                selected_packages = self.install_config['packages']

+                try:

+                    selected_packages.remove('linux')

+                except ValueError:

+                    pass

+                try:

+                    selected_packages.remove('initramfs')

+                except ValueError:

+                    pass

+                selected_packages.append('linux-esx')

+        except KeyError:

+            pass

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

         if comment != None:

@@ -34,9 +34,10 @@ from jsonwrapper import JsonWrapper

 from selectdisk import SelectDisk

 from license import License

 from ostreeserverselector import OSTreeServerSelector

+from linuxselector import LinuxSelector

 class IsoInstaller(object):

-    

+

     def get_config(self, path):

         if path.startswith("http://"):

             # Do 5 trials to get the kick start

@@ -185,6 +186,14 @@ class IsoInstaller(object):

         return ""

+    def is_vmware_virtualization(self):

+        process = subprocess.Popen(['systemd-detect-virt'], stdout=subprocess.PIPE)

+        out,err = process.communicate()

+        if err != None and err != 0:

+            return False

+        else:

+            return out == 'vmware\n'

+

     def __init__(self, stdscreen, options_file):

         self.screen = stdscreen

@@ -225,11 +234,13 @@ class IsoInstaller(object):

             random_id = '%12x' % random.randrange(16**12)

             random_hostname = "photon-" + random_id.strip()

             install_config = {'iso_system': False}

+            install_config['vmware_virt'] = False

+            if self.is_vmware_virtualization():

+                install_config['vmware_virt'] = True

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

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

             select_partition = PartitionISO(self.maxy, self.maxx, install_config)

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

-

             self.alpha_chars = range(65, 91)

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

             partition_accepted_chars = list(range(48, 58))

@@ -289,20 +300,24 @@ class IsoInstaller(object):

                     None, # post processing of the input field

                     'Please provide the Refspec in OSTree repo', 'OSTree Repo Refspec:', 2, install_config,

                     "photon/1.0/x86_64/minimal")

-            

-            items = items + [

-                    (license_agreement.display, False),

-                    (select_disk.display, True),

-                    (select_partition.display, False),

-                    (select_disk.guided_partitions, False),

-                    (package_selector.display, True),

-                    (hostname_reader.get_user_string, True),

-                    (root_password_reader.get_user_string, True),

-                    (confirm_password_reader.get_user_string, False),

-                    (ostree_server_selector.display, True),

-                    (ostree_url_reader.get_user_string, True),

-                    (ostree_ref_reader.get_user_string, True),

-                 ]

+

+            items.append((license_agreement.display, False))                    ,

+            items.append((select_disk.display, True))

+            items.append((select_partition.display, False))

+            items.append((select_disk.guided_partitions, False))

+            items.append((package_selector.display, True))

+            select_linux_index = -1

+            if install_config['vmware_virt'] == True:

+                linux_selector   = LinuxSelector(self.maxy, self.maxx, install_config)

+                items.append((linux_selector.display, True))

+                select_linux_index = items.index((linux_selector.display, True))

+            items.append((hostname_reader.get_user_string, True))

+            items.append((root_password_reader.get_user_string, True))

+            items.append((confirm_password_reader.get_user_string, False))

+            items.append((ostree_server_selector.display, True))

+            items.append((ostree_url_reader.get_user_string, True))

+            items.append((ostree_ref_reader.get_user_string, True))

+

         else:

             install_config = ks_config

             install_config['iso_system'] = False

@@ -322,12 +337,22 @@ class IsoInstaller(object):

                     self.screen.clear()

                 if index == len(items):

                     break

+                #Skip linux select screen for ostree installation.

+                if index == select_linux_index:

+                    if (install_config['type'] == 'ostree_host' or

+                        install_config['type'] == 'ostree_server'):

+                        index += 1

             else:

                 index -= 1

                 while index >= 0 and items[index][1] == False:

                     index -= 1

                 if index < 0:

                     index = 0

+                #Skip linux select screen for ostree installation.

+                if index == select_linux_index:

+                    if (install_config['type'] == 'ostree_host' or

+                        install_config['type'] == 'ostree_server'):

+                        index -= 1

 if __name__ == '__main__':

     usage = "Usage: %prog [options]"

new file mode 100644

@@ -0,0 +1,47 @@

+#!/usr/bin/python2

+#

+#    Copyright (C) 2017 vmware inc.

+#

+#    Author: Xiaolin Li <xiaolinl@vmware.com>

+

+import json

+import os

+import curses

+from sets import Set

+from jsonwrapper import JsonWrapper

+from menu import Menu

+from window import Window

+from actionresult import ActionResult

+

+class LinuxSelector(object):

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

+        self.install_config = install_config

+        self.maxx = maxx

+        self.maxy = maxy

+        self.win_width = 50

+        self.win_height = 13

+

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

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

+

+        self.menu_starty = self.win_starty + 3

+

+        self.menu_items = []

+        self.menu_items.append(("1. linux", self.set_linux_esx_installation, False))

+        self.menu_items.append(("2. linux-esx", self.set_linux_esx_installation, True))

+

+        self.host_menu = Menu(self.menu_starty, self.maxx, self.menu_items,

+                              default_selected = 0, tab_enable=False)

+

+        self.window = Window(self.win_height, self.win_width, self.maxy, self.maxx,

+                             'Select Linux', True, items=[], tab_enabled = False,

+                             position = 1, can_go_next=True)

+        self.window.set_action_panel(self.host_menu)

+

+    def set_linux_esx_installation(self, is_linux_esx):

+        self.install_config['install_linux_esx'] = is_linux_esx

+        return ActionResult(True, None)

+

+    def display(self, params):

+        return self.window.do_action()

+

@@ -28,7 +28,9 @@ class PackageSelector(object):

         self.load_package_list(options_file)

-        self.window = Window(self.win_height, self.win_width, self.maxy, self.maxx, 'Select Installation', True, self.package_menu, can_go_next=True, position=1)

+        self.window = Window(self.win_height, self.win_width, self.maxy, self.maxx,

+                             'Select Installation', True, action_panel = self.package_menu,

+                             can_go_next = True, position = 1)

     @staticmethod

     def get_packages_to_install(options, config_type, output_data_path):