[node-patches] Change in ovirt-node[master]: find_grub_cfg(): Add elif statement to get correct cfg_path ...

[rbarry at redhat.com]

Ryan Barry has posted comments on this change.

Change subject: find_grub_cfg(): Add elif statement to get correct cfg_path for efi_boot
......................................................................


Patch Set 11:

(2 comments)

http://gerrit.ovirt.org/#/c/26418/11/src/ovirt/node/utils/system.py
File src/ovirt/node/utils/system.py:

Line 932:     @staticmethod
Line 933:     def find_grub_cfg():
Line 934:         cfg = None
Line 935:         if Filesystem.by_label("Boot"):
Line 936:             cfg_path = "/boot/grub/"
This may fail to find the correct grub path for UEFI+iscsi
Line 937:         elif is_efi():
Line 938:             mount_efi(target="/liveos")
Line 939:             cfg_path = "/liveos/EFI"
Line 940:         elif os.path.ismount("/dev/.initramfs/live"):


Line 934:         cfg = None
Line 935:         if Filesystem.by_label("Boot"):
Line 936:             cfg_path = "/boot/grub/"
Line 937:         elif is_efi():
Line 938:             mount_efi(target="/liveos")
As may this

If it's iSCSI+UEFI, we'll have to grep for 'PARTLABEL=EFI' in blkid and find a /dev/mapper device, then mount that at /boot/efi
Line 939:             cfg_path = "/liveos/EFI"
Line 940:         elif os.path.ismount("/dev/.initramfs/live"):
Line 941:             cfg_path = "/dev/.initramfs/live"
Line 942:         elif os.path.ismount("/run/initramfs/.live"):


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I299fb4906d8d2e947130daea1de570a9347bb202
Gerrit-PatchSet: 11
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: hadong <hadong0720 at gmail.com>
Gerrit-Reviewer: Fabian Deutsch <fabiand at redhat.com>
Gerrit-Reviewer: Joey Boggs <jboggs at redhat.com>
Gerrit-Reviewer: Ryan Barry <rbarry at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: hadong <hadong0720 at gmail.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes