44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
|
From 97b30ff21f97a98dbb7de3fd676fb360b6e28040 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Peter Jones <pjones@redhat.com>
|
||
|
|
Date: Tue, 28 Apr 2015 11:17:02 -0400
|
||
|
|
Subject: [PATCH 2/2] Make rescue and debug entries sort right /again/ in
|
||
|
|
grub2-mkconfig.
|
||
|
|
|
||
|
|
Related: rhbz#12145839
|
||
|
|
|
||
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||
|
|
---
|
||
|
|
util/grub-mkconfig_lib.in | 16 ++++++++--------
|
||
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
|
||
|
|
index e85b60c..2e03651 100644
|
||
|
|
--- a/util/grub-mkconfig_lib.in
|
||
|
|
+++ b/util/grub-mkconfig_lib.in
|
||
|
|
@@ -254,14 +254,14 @@ version_test_gt ()
|
||
|
|
*.old:*.old) ;;
|
||
|
|
*.old:*) version_test_gt_a="`echo -n "$version_test_gt_a" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=gt ;;
|
||
|
|
*:*.old) version_test_gt_b="`echo -n "$version_test_gt_b" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=ge ;;
|
||
|
|
- *-rescue-*:*-rescue-*) ;;
|
||
|
|
- *.debug:*.debug) ;;
|
||
|
|
- *-rescue-*:*.debug) return 1 ;;
|
||
|
|
- *.debug:*-rescue-*) return 0 ;;
|
||
|
|
- *-rescue-*:*) return 1 ;;
|
||
|
|
- *:*-rescue-*) return 0 ;;
|
||
|
|
- *.debug:*) return 1 ;;
|
||
|
|
- *:*.debug) return 0 ;;
|
||
|
|
+ *-rescue*:*-rescue*) ;;
|
||
|
|
+ *?debug:*?debug) ;;
|
||
|
|
+ *-rescue*:*?debug) return 1 ;;
|
||
|
|
+ *?debug:*-rescue*) return 0 ;;
|
||
|
|
+ *-rescue*:*) return 1 ;;
|
||
|
|
+ *:*-rescue*) return 0 ;;
|
||
|
|
+ *?debug:*) return 1 ;;
|
||
|
|
+ *:*?debug) return 0 ;;
|
||
|
|
esac
|
||
|
|
version_test_numeric "$version_test_gt_a" "$version_test_gt_cmp" "$version_test_gt_b"
|
||
|
|
return "$?"
|
||
|
|
--
|
||
|
|
2.3.6
|
||
|
|
|