Hello community, here is the log from the commit of package efibootmgr for openSUSE:Factory checked in at 2014-07-15 16:25:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/efibootmgr (Old) and /work/SRC/openSUSE:Factory/.efibootmgr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "efibootmgr" Changes: -------- --- /work/SRC/openSUSE:Factory/efibootmgr/efibootmgr.changes 2014-02-19 11:39:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.efibootmgr.new/efibootmgr.changes 2014-07-15 16:25:59.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jul 7 10:45:04 UTC 2014 - [email protected] + +- Add efibootmgr-0.6.0-check-boot-order.diff to delete BootOrder + if there is no more boot option. [bnc#883545] + +------------------------------------------------------------------- New: ---- efibootmgr-0.6.0-check-boot-order.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ efibootmgr.spec ++++++ --- /var/tmp/diff_new_pack.hLQ4aR/_old 2014-07-15 16:25:59.000000000 +0200 +++ /var/tmp/diff_new_pack.hLQ4aR/_new 2014-07-15 16:25:59.000000000 +0200 @@ -29,6 +29,7 @@ Patch2: %{name}-0.6.0-set_boot_order.diff Patch3: %{name}-0.6.0-fail-visibly.diff Patch4: %{name}-0.6.0-write-unique-id-once.diff +Patch5: %{name}-0.6.0-check-boot-order.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pciutils-devel @@ -48,6 +49,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build LOADER="grub.efi" # default loader ++++++ efibootmgr-0.6.0-check-boot-order.diff ++++++ diff --git a/src/efibootmgr/efibootmgr.c b/src/efibootmgr/efibootmgr.c index 7ea1887..b01a05a 100644 --- a/src/efibootmgr/efibootmgr.c +++ b/src/efibootmgr/efibootmgr.c @@ -380,6 +380,9 @@ remove_from_boot_order(uint16_t num) } } + if (new_i == 0) + return delete_variable(&boot_order); + /* Now new_data has what we need */ new_data_size = new_i * sizeof(uint16_t); memset(&(boot_order.Data), 0, boot_order.DataSize); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
