summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-02-10 22:48:28 (GMT)
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-02-17 23:22:35 (GMT)
commitf55d0d5edd7fb54198d43f64419291b93dca2346 (patch)
tree32b9167438107e4cd58a72661f1c4b5cdac386d6
parentaee1d3319b2a7901e799c41cd9a6b2de91dea5b8 (diff)
just let grub2-mkconfig do its job for grub2
remaining issue: we're calling update-grub2 too early, in kernel's %preun instead of its %postun... (mga#16268)
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/bootloader-config2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index c83ceda..bffb591 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,7 @@
- detect nvme devices as block devices (mga#17743)
- detect partitions on nvme devices (mga#17743)
+- drakboot:
+ o partial fix for removing kernel from grub2 config (mga#16268)
Version 17.18.1 - 10 February 2016
diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config
index e61dbd4..187ca3e 100755
--- a/perl-install/standalone/bootloader-config
+++ b/perl-install/standalone/bootloader-config
@@ -98,7 +98,7 @@ sub remove_kernel() {
return;
}
- remove_kernel_generic();
+ remove_kernel_generic() if bootloader::main_method($bootloader->{method}) ne 'grub2';
modify_bootloader();
}