Annotation of /trunk/grub/patches/grub-2.00-cosmetic.patch
Parent Directory | Revision Log
Revision 1847 -
(hide annotations)
(download)
Tue Jul 17 12:59:53 2012 UTC (11 years, 11 months ago) by niro
File size: 2381 byte(s)
Tue Jul 17 12:59:53 2012 UTC (11 years, 11 months ago) by niro
File size: 2381 byte(s)
-reworked patches for 2.00
1 | niro | 1847 | diff -Naur grub-2.00/util/grub.d/10_linux.in grub-2.00-magellan/util/grub.d/10_linux.in |
2 | --- grub-2.00/util/grub.d/10_linux.in 2012-04-18 23:24:38.000000000 +0200 | ||
3 | +++ grub-2.00-magellan/util/grub.d/10_linux.in 2012-07-17 16:45:53.627983193 +0200 | ||
4 | @@ -31,7 +31,7 @@ | ||
5 | if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then | ||
6 | OS=GNU/Linux | ||
7 | else | ||
8 | - OS="${GRUB_DISTRIBUTOR} GNU/Linux" | ||
9 | + OS="${GRUB_DISTRIBUTOR}" | ||
10 | CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}" | ||
11 | fi | ||
12 | |||
13 | @@ -86,9 +86,9 @@ | ||
14 | if [ x$type != xsimple ] ; then | ||
15 | case $type in | ||
16 | recovery) | ||
17 | - title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; | ||
18 | + title="$(gettext_printf "%s [ %s ] (recovery mode)" "${os}" "${version}")" ;; | ||
19 | *) | ||
20 | - title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; | ||
21 | + title="$(gettext_printf "%s [ %s ]" "${os}" "${version}")" ;; | ||
22 | esac | ||
23 | if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then | ||
24 | replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" | ||
25 | diff -Naur grub-2.00/util/grub.d/20_linux_xen.in grub-2.00-magellan/util/grub.d/20_linux_xen.in | ||
26 | --- grub-2.00/util/grub.d/20_linux_xen.in 2012-06-03 21:57:42.000000000 +0200 | ||
27 | +++ grub-2.00-magellan/util/grub.d/20_linux_xen.in 2012-07-17 16:47:23.236981662 +0200 | ||
28 | @@ -31,7 +31,7 @@ | ||
29 | if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then | ||
30 | OS=GNU/Linux | ||
31 | else | ||
32 | - OS="${GRUB_DISTRIBUTOR} GNU/Linux" | ||
33 | + OS="${GRUB_DISTRIBUTOR}" | ||
34 | CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}" | ||
35 | fi | ||
36 | |||
37 | @@ -94,9 +94,9 @@ | ||
38 | fi | ||
39 | if [ x$type != xsimple ] ; then | ||
40 | if [ x$type = xrecovery ] ; then | ||
41 | - title="$(gettext_printf "%s, with Xen %s and Linux %s (recovery mode)" "${os}" "${xen_version}" "${version}")" | ||
42 | + title="$(gettext_printf "%s Xen %s [ %s ] (recovery mode)" "${os}" "${xen_version}" "${version}")" | ||
43 | else | ||
44 | - title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")" | ||
45 | + title="$(gettext_printf "%s Xen %s [ %s ]" "${os}" "${xen_version}" "${version}")" | ||
46 | fi | ||
47 | replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" | ||
48 | if [ x"Xen ${xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then |