[node-patches] Change in ovirt-node[master]: Fix always use the first one of the disk list as boot disk i...

[hadong0720 at gmail.com]

hadong has uploaded a new change for review.

Change subject: Fix always use the first one of the disk list as boot disk issue
......................................................................

Fix always use the first one of the disk list as boot disk issue

Previously ovirt node always use the first one of the disk list
on boot_device_page as boot disk
Now fix it to use the selected disk as boot disk.

Change-Id: I1cc27143b544a228daf1278ea5bc67e6c84598c1
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=965907
Signed-off-by: hadong <hadong0720 at gmail.com>
---
M src/ovirt/node/installer/core/boot_device_page.py
M src/ovirt/node/installer/core/progress_page.py
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/57/18157/1

diff --git a/src/ovirt/node/installer/core/boot_device_page.py b/src/ovirt/node/installer/core/boot_device_page.py
index 13708ad..546cff4 100644
--- a/src/ovirt/node/installer/core/boot_device_page.py
+++ b/src/ovirt/node/installer/core/boot_device_page.py
@@ -88,6 +88,7 @@
             if device == "other":
                 self.widgets["label.details"].text("")
             else:
+                changes["boot.device.current"] = device
                 self._model.update(changes)
                 self.widgets["label.details"].set_device(device)
 
diff --git a/src/ovirt/node/installer/core/progress_page.py b/src/ovirt/node/installer/core/progress_page.py
index d075748..1932ea7 100644
--- a/src/ovirt/node/installer/core/progress_page.py
+++ b/src/ovirt/node/installer/core/progress_page.py
@@ -161,7 +161,7 @@
             tx += [self.UpdateDefaultsFromModels(cfg),
                    self.PartitionAndFormat(cfg["installation.devices"]),
                    self.SetPassword(cfg["admin.password_confirmation"]),
-                   self.InstallImageAndBootloader(cfg["boot.device"]),
+                   self.InstallImageAndBootloader(cfg["boot.device.current"]),
                    self.SetKeyboardLayout(cfg["keyboard.layout"])]
 
         elif cfg["method"] in ["upgrade", "downgrade", "reinstall"]:
@@ -201,7 +201,7 @@
             cfg = self.config
             model = defaults.Installation()
 
-            model.install_on(init=[cfg["boot.device"]] +
+            model.install_on(init=[cfg["boot.device.current"]] +
                              cfg["installation.devices"],
                              root_size=cfg["storage.root_size"],
                              efi_size=cfg["storage.efi_size"],


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1cc27143b544a228daf1278ea5bc67e6c84598c1
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: hadong <hadong0720 at gmail.com>