[node-patches] Change in ovirt-node[master]: Properly initialize the labels on the console page

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Properly initialize the labels on the console page
......................................................................

Properly initialize the labels on the console page

Pass the correct amount of arguments so the dialog opens.

Change-Id: I8aa92c5d826824872f7b051376040b3816e51188
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1095144
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M src/ovirt/node/config/defaults.py
M src/ovirt/node/setup/core/status_page.py
2 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/48/27648/1

diff --git a/src/ovirt/node/config/defaults.py b/src/ovirt/node/config/defaults.py
index 10b7559..c326f16 100644
--- a/src/ovirt/node/config/defaults.py
+++ b/src/ovirt/node/config/defaults.py
@@ -1167,9 +1167,9 @@
                     system.service("kdump", "restart")
                 except utils.process.CalledProcessError as e:
                     self.logger.info("Failure while restarting kdump: %s" % e)
-                    unmount_config("/etc/kdump.conf")
-                    self.backups.restore("/etc/kdump.conf")
-                    system.service("kdump", "restart", do_raise=False)
+                    #unmount_config("/etc/kdump.conf")
+                    #self.backups.restore("/etc/kdump.conf")
+                    #system.service("kdump", "restart", do_raise=False)
 
                     raise RuntimeError("KDump configuration failed, " +
                                        "location unreachable. Previous " +
diff --git a/src/ovirt/node/setup/core/status_page.py b/src/ovirt/node/setup/core/status_page.py
index 0f42a28..76c574a 100644
--- a/src/ovirt/node/setup/core/status_page.py
+++ b/src/ovirt/node/setup/core/status_page.py
@@ -274,8 +274,8 @@
         super(ConsoleDialog, self).__init__(path, title, [])
         self.plugin._extra_model.update({"console.path": self._console()})
         self.plugin.model()
-        self.children = [ui.Label("Enter the path to a valid console device"),
-                         ui.Label("Example: /dev/ttyS0,115200n8"),
+        self.children = [ui.Label("console.label[0]", "Enter the path to a valid console device"),
+                         ui.Label("console.label[1]", "Example: /dev/ttyS0,115200n8"),
                          ui.Entry("console.path", "Console path:")]
 
     def _console(self, console_path=None):


-- 
To view, visit http://gerrit.ovirt.org/27648
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8aa92c5d826824872f7b051376040b3816e51188
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>