Annotation of /trunk/grub/patches/grub-2.02-cosmetic.patch
Parent Directory
| 
Revision Log
Revision 2899 -
(hide annotations)
(download)
Tue Apr 4 09:29:54 2017 UTC (7 years, 2 months ago) by niro
File size: 2483 byte(s)
Tue Apr 4 09:29:54 2017 UTC (7 years, 2 months ago) by niro
File size: 2483 byte(s)
-re-diffed patchwork
| 1 | niro | 2899 | diff -Naur grub-2.02~rc2/util/grub.d/10_linux.in grub-2.02~rc2-magellan/util/grub.d/10_linux.in |
| 2 | --- grub-2.02~rc2/util/grub.d/10_linux.in 2017-02-11 23:25:13.000000000 +0100 | ||
| 3 | +++ grub-2.02~rc2-magellan/util/grub.d/10_linux.in 2017-04-04 11:08:55.689901018 +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|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" | ||
| 11 | fi | ||
| 12 | |||
| 13 | @@ -82,9 +82,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.02~rc2/util/grub.d/20_linux_xen.in grub-2.02~rc2-magellan/util/grub.d/20_linux_xen.in | ||
| 26 | --- grub-2.02~rc2/util/grub.d/20_linux_xen.in 2017-02-11 23:25:13.000000000 +0100 | ||
| 27 | +++ grub-2.02~rc2-magellan/util/grub.d/20_linux_xen.in 2017-04-04 11:09:59.025218662 +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|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" | ||
| 35 | fi | ||
| 36 | |||
| 37 | @@ -90,9 +90,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 |