@@ -11,8 +11,11 @@ from actionresult import ActionResult

 class ConfirmWindow(Window):

-    def __init__(self, height, width, maxy, maxx, menu_starty, message):

-        items =   [

+    def __init__(self, height, width, maxy, maxx, menu_starty, message, info=False):

+        if info:

+            items =   [('OK',  self.exit_function, True)]

+        else:

+            items =   [

                         ('Yes',  self.exit_function, True),

                         ('No',  self.exit_function, False)

                     ]

@@ -116,12 +116,15 @@ 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,  'Choose the hostname for your system',

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

                 'Hostname:', 

                 2, self.install_config)

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

+            root_password_reader = WindowStringReader(self.maxy, self.maxx, 10, 70, True, 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 Root password:', 

+                2, self.install_config)

             items = items + [

                     (license_agreement.display, False),

@@ -129,6 +132,7 @@ class IsoInstaller(object):

                     (package_selector.display, True),

                     (hostname_reader.get_user_string, True),

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

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

@@ -11,19 +11,19 @@ import random

 import cracklib

 from actionresult import ActionResult

 from action import Action

+from confirmwindow import ConfirmWindow

 class ReadText(Action):

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

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

         self.textwin = textwin

+        self.maxy = maxy

+        self.maxx = maxx

         self.y = y

         self.install_config = install_config

         self.ispassword = ispassword

-        self.x = 0

-

-        #initialize the ----

-        dashes = '_' * (self.textwin.getmaxyx()[1] - 1)

-        self.textwin.addstr(self.y, 0, dashes)

-        self.str = ''

+        self.confirm_pass = confirm_pass;

+        

+        self.init_text()        

         #initialize the accepted characters

         if self.ispassword:

@@ -46,21 +46,42 @@ class ReadText(Action):

     def hide(self):

         return

+    def init_text(self):

+        self.x = 0;

+        #initialize the ----

+        dashes = '_' * (self.textwin.getmaxyx()[1] - 1)

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

+        self.str = ''

+

+        #remove the error messages

+        spaces = ' ' * (self.textwin.getmaxyx()[1] - 1)

+        self.textwin.addstr(self.y + 2, 0, spaces)

+

     def do_action(self):

+        self.init_text()

         curses.curs_set(1)

         while True:

             ch = self.textwin.getch(self.y, self.x)

             if ch in [curses.KEY_ENTER, ord('\n')]:

-                if self.ispassword:

+                if self.confirm_pass:

+                    if self.str != self.install_config['password']:

+                        curses.curs_set(0)

+                        conf_message_height = 8

+                        conf_message_width = 40

+                        conf_message_button_y = (self.maxy - conf_message_height) / 2 + 5

+                        confrim_window = ConfirmWindow(conf_message_height, conf_message_width, self.maxy, self.maxx, conf_message_button_y, "passwords don't match, please try again.", True)

+                        confrim_window.do_action()

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

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

+                elif self.ispassword:

                     err = self.validate_password(self.str)

                     if err != self.str:

-                        spaces = ' ' * (self.textwin.getmaxyx()[1] - 1)

-                        self.textwin.addstr(self.y + 2, 0, spaces)

+                        self.init_text()

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

                         continue

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

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

                 else:

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

@@ -87,6 +108,8 @@ class ReadText(Action):

                 self.x += 1

     def validate_hostname(self, hostname):

+        if (hostname == None or len(hostname) == 0):

+            return False;

         return (ord(hostname[0]) in self.alpha_chars) and (hostname[-1] not in ['.', '-'])

     def validate_password(self, text):

@@ -51,9 +51,14 @@ class Window(Action):

             self.hide_window()

             return action_result

         else:

-            #highlight the GoBack and keep going

-            self.contentwin.addstr(self.height - 3, 5, '<Go Back>', curses.color_pair(3))

-            self.contentwin.refresh()

+            if (action_result.result != None and 'goBack' in action_result.result and action_result.result['goBack']):

+                self.hide_window()

+                self.action_panel.hide()

+                return action_result

+            else:

+                #highlight the GoBack and keep going

+                self.contentwin.addstr(self.height - 3, 5, '<Go Back>', curses.color_pair(3))

+                self.contentwin.refresh()

         while action_result.success == False:

             key = self.contentwin.getch()

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

 from readtext import ReadText

 class WindowStringReader(object):

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

-        self.ispassword = ispassword

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

         self.title = title

         self.display_string = display_string

         self.inputy = inputy

@@ -24,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(self.window.content_window(), self.inputy, install_config, self.ispassword)

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

         self.window.set_action_panel(self.read_text)

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

@@ -33,6 +33,7 @@

         "<wait5><enter><enter><enter>",

         "<down><down><enter><wait>",

         "photon<enter><wait>",

+        "{{user `ssh_password`}}<enter><wait>",

         "{{user `ssh_password`}}<enter>",

         "<wait10><wait10><wait10><wait10><wait10><wait10><wait10>",

         "<enter>",

@@ -66,6 +67,7 @@

         "<wait5><enter><enter><enter>",

         "<down><down><enter><wait>",

         "photon<enter><wait>",

+        "{{user `ssh_password`}}<enter><wait>",

         "{{user `ssh_password`}}<enter>",

         "<wait10><wait10><wait10><wait10><wait10><wait10><wait10>",

         "<enter>",