Skip to content

Commit 2ba061b

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Output verbose info from efibootmgr" into stable/wallaby
2 parents bce22e2 + 9753b61 commit 2ba061b

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

ironic_python_agent/extensions/image.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,8 @@ def _run_efibootmgr(valid_efi_bootloaders, device, efi_partition,
274274
"""
275275

276276
# Before updating let's get information about the bootorder
277-
LOG.debug("Getting information about boot order")
278-
utils.execute('efibootmgr')
277+
LOG.debug("Getting information about boot order.")
278+
utils.execute('efibootmgr', '-v')
279279
# NOTE(iurygregory): regex used to identify the Warning in the stderr after
280280
# we add the new entry. Example:
281281
# "efibootmgr: ** Warning ** : Boot0004 has same label ironic"
@@ -302,7 +302,7 @@ def _run_efibootmgr(valid_efi_bootloaders, device, efi_partition,
302302
'dev': device})
303303
# Update the nvram using efibootmgr
304304
# https://linux.die.net/man/8/efibootmgr
305-
cmd = utils.execute('efibootmgr', '-c', '-d', device,
305+
cmd = utils.execute('efibootmgr', '-v', '-c', '-d', device,
306306
'-p', efi_partition, '-w', '-L', label,
307307
'-l', v_efi_bl_path)
308308
for line in cmd[1].split('\n'):

ironic_python_agent/tests/unit/extensions/test_image.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,8 @@ def test__uefi_bootloader_given_partition(
259259
mock.call('udevadm', 'settle'),
260260
mock.call('mount', self.fake_efi_system_part,
261261
self.fake_dir + '/boot/efi'),
262-
mock.call('efibootmgr'),
263-
mock.call('efibootmgr', '-c', '-d', self.fake_dev,
262+
mock.call('efibootmgr', '-v'),
263+
mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
264264
'-p', '1', '-w',
265265
'-L', 'ironic1', '-l',
266266
'\\EFI\\BOOT\\BOOTX64.EFI'),
@@ -307,8 +307,8 @@ def test__uefi_bootloader_find_partition(
307307
mock.call('udevadm', 'settle'),
308308
mock.call('mount', self.fake_efi_system_part,
309309
self.fake_dir + '/boot/efi'),
310-
mock.call('efibootmgr'),
311-
mock.call('efibootmgr', '-c', '-d', self.fake_dev,
310+
mock.call('efibootmgr', '-v'),
311+
mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
312312
'-p', '1', '-w',
313313
'-L', 'ironic1', '-l',
314314
'\\EFI\\BOOT\\BOOTX64.EFI'),
@@ -360,8 +360,8 @@ def test__uefi_bootloader_with_entry_removal(
360360
mock.call('udevadm', 'settle'),
361361
mock.call('mount', self.fake_efi_system_part,
362362
self.fake_dir + '/boot/efi'),
363-
mock.call('efibootmgr'),
364-
mock.call('efibootmgr', '-c', '-d', self.fake_dev,
363+
mock.call('efibootmgr', '-v'),
364+
mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
365365
'-p', '1', '-w',
366366
'-L', 'ironic1', '-l',
367367
'\\EFI\\BOOT\\BOOTX64.EFI'),
@@ -413,12 +413,12 @@ def test__add_multi_bootloaders(
413413
mock.call('udevadm', 'settle'),
414414
mock.call('mount', self.fake_efi_system_part,
415415
self.fake_dir + '/boot/efi'),
416-
mock.call('efibootmgr'),
417-
mock.call('efibootmgr', '-c', '-d', self.fake_dev,
416+
mock.call('efibootmgr', '-v'),
417+
mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
418418
'-p', '1', '-w',
419419
'-L', 'ironic1', '-l',
420420
'\\EFI\\BOOT\\BOOTX64.EFI'),
421-
mock.call('efibootmgr', '-c', '-d', self.fake_dev,
421+
mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
422422
'-p', '1', '-w',
423423
'-L', 'ironic2', '-l',
424424
'\\WINDOWS\\system32\\winload.efi'),
@@ -2142,8 +2142,8 @@ def test__manage_uefi(self, mkdir_mock, mock_utils_efi_part,
21422142
mock.call('udevadm', 'settle'),
21432143
mock.call('mount', self.fake_efi_system_part,
21442144
self.fake_dir + '/boot/efi'),
2145-
mock.call('efibootmgr'),
2146-
mock.call('efibootmgr', '-c', '-d', self.fake_dev,
2145+
mock.call('efibootmgr', '-v'),
2146+
mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
21472147
'-p', '1', '-w',
21482148
'-L', 'ironic1', '-l',
21492149
'\\EFI\\BOOT\\BOOTX64.EFI'),
@@ -2186,8 +2186,8 @@ def test__manage_uefi_found_csv(self, mkdir_mock, mock_utils_efi_part,
21862186
mock.call('udevadm', 'settle'),
21872187
mock.call('mount', self.fake_efi_system_part,
21882188
self.fake_dir + '/boot/efi'),
2189-
mock.call('efibootmgr'),
2190-
mock.call('efibootmgr', '-c', '-d', self.fake_dev,
2189+
mock.call('efibootmgr', '-v'),
2190+
mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
21912191
'-p', '1', '-w',
21922192
'-L', 'Vendor String', '-l',
21932193
'\\EFI\\vendor\\shimx64.efi'),
@@ -2226,8 +2226,8 @@ def test__manage_uefi_nvme_device(self, mkdir_mock, mock_utils_efi_part,
22262226
mock.call('udevadm', 'settle'),
22272227
mock.call('mount', '/dev/fakenvme0p1',
22282228
self.fake_dir + '/boot/efi'),
2229-
mock.call('efibootmgr'),
2230-
mock.call('efibootmgr', '-c', '-d', '/dev/fakenvme0',
2229+
mock.call('efibootmgr', '-v'),
2230+
mock.call('efibootmgr', '-v', '-c', '-d', '/dev/fakenvme0',
22312231
'-p', '1', '-w',
22322232
'-L', 'ironic1', '-l',
22332233
'\\EFI\\BOOT\\BOOTX64.EFI'),
@@ -2266,8 +2266,8 @@ def test__manage_uefi_wholedisk(
22662266
mock.call('udevadm', 'settle'),
22672267
mock.call('mount', self.fake_efi_system_part,
22682268
self.fake_dir + '/boot/efi'),
2269-
mock.call('efibootmgr'),
2270-
mock.call('efibootmgr', '-c', '-d', self.fake_dev,
2269+
mock.call('efibootmgr', '-v'),
2270+
mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
22712271
'-p', '1', '-w',
22722272
'-L', 'ironic1', '-l',
22732273
'\\EFI\\BOOT\\BOOTX64.EFI'),
@@ -2373,8 +2373,8 @@ def test__run_efibootmgr(self, mock_execute, mock_dispatch):
23732373
self.fake_dev,
23742374
self.fake_efi_system_part,
23752375
self.fake_dir)
2376-
expected = [mock.call('efibootmgr'),
2377-
mock.call('efibootmgr', '-c', '-d', self.fake_dev,
2376+
expected = [mock.call('efibootmgr', '-v'),
2377+
mock.call('efibootmgr', '-v', '-c', '-d', self.fake_dev,
23782378
'-p', self.fake_efi_system_part, '-w',
23792379
'-L', 'ironic1', '-l',
23802380
'\\EFI\\BOOT\\BOOTX64.EFI')]

0 commit comments

Comments
 (0)