mirror of
https://git.proxmox.com/git/grub2
synced 2025-07-25 06:52:53 +00:00
c3f791031d
- Ensure uniqueness of RAID array numbers even if some elements have a
name (closes: #609804).
- Remove unnecessary brackets from tr arguments (closes: #612564).
- Add grub-mkrescue info documentation (closes: #612585).
- Avoid generating invalid configuration when something that looks like
a Xen hypervisor is present without any Xen kernels (closes: #612898).
- Fix memory alignment when calling 'linux' multiple times on EFI
(closes: #616638).
- Fix grub-install on amd64 EFI systems (closes: #617388).
- Automatically export pager variable (closes: #612995).
- Fix parser error with "time" (closes: #612991).
- Ignore case of bitmap extensions (closes: #611123).
- Skip vmlinux-* on x86 platforms (closes: #536846, #546008).
- Accept old-style Xen kernels (closes: #610428).
- Skip damaged LVM volumes (closes: #544731).
- Handle LVM mirroring (closes: #598441).
- Detect spares and report them as not RAID members (closes: #611561).
- Don't enable localisation unless gfxterm is available (closes:
#604609).
- Fix partitioned RAID support (closes: #595071, #613444).
- Dynamically count the number of lines for the lower banner (closes:
#606494).
- Improve quoting in grub-mkconfig, to support background image file
names containing spaces (closes: #612417).
- Flush BIOS disk devices more accurately (closes: #623124).
* Update branch_embed-sectors.patch:
- Detect sector used by HighPoint RAID controller (closes: #394868).
31 lines
945 B
Diff
31 lines
945 B
Diff
Description: Improve handling of Debian kernel version numbers
|
|
Author: Robert Millan <rmh@aybabtu.com>
|
|
Forwarded: not-needed
|
|
Last-Update: 2011-04-21
|
|
|
|
Index: b/util/grub-mkconfig_lib.in
|
|
===================================================================
|
|
--- a/util/grub-mkconfig_lib.in
|
|
+++ b/util/grub-mkconfig_lib.in
|
|
@@ -172,8 +172,9 @@
|
|
|
|
version_test_gt ()
|
|
{
|
|
- local a="`echo "$1" | sed -e "s/[^-]*-//"`"
|
|
- local b="`echo "$2" | sed -e "s/[^-]*-//"`"
|
|
+ local sedexp="s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git\|old\|trunk\)/~\1/g"
|
|
+ local a="`echo "$1" | sed -e "$sedexp"`"
|
|
+ local b="`echo "$2" | sed -e "$sedexp"`"
|
|
local cmp=gt
|
|
if [ "x$b" = "x" ] ; then
|
|
return 0
|
|
@@ -183,7 +184,7 @@
|
|
*.old:*) a="`echo -n "$a" | sed -e 's/\.old$//'`" ; cmp=gt ;;
|
|
*:*.old) b="`echo -n "$b" | sed -e 's/\.old$//'`" ; cmp=ge ;;
|
|
esac
|
|
- version_test_numeric "$a" "$cmp" "$b"
|
|
+ dpkg --compare-versions "$a" $cmp "$b"
|
|
return "$?"
|
|
}
|
|
|