openstack/ironic-python-agent
Code Issues Proposed changes

Merge "Fixes programmatic error in _install_grub()"

Browse Source
This commit is contained in:
Jenkins 2016-03-12 01:13:22 +00:00 committed by Gerrit Code Review
commit 21afeb4017
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ironic_python_agent/extensions/image.py
View File

@ -82,6 +82,8 @@ def _install_grub2(device, root_uuid, efi_system_part_uuid=None):
"""Install GRUB2 bootloader on a given device."""
LOG.debug("Installing GRUB2 bootloader on device %s", device)
root_partition = _get_partition(device, uuid=root_uuid)
efi_partition = None
efi_partition_mount_point = None
try:
# Mount the partition and binds
@ -90,9 +92,6 @@ def _install_grub2(device, root_uuid, efi_system_part_uuid=None):
if efi_system_part_uuid:
efi_partition = _get_partition(device, uuid=efi_system_part_uuid)
efi_partition_mount_point = os.path.join(path, "boot/efi")
else:
efi_partition = None
efi_partition_mount_point = None
utils.execute('mount', root_partition, path)
for fs in BIND_MOUNTS: