diff options
| -rw-r--r-- | libre/grub/PKGBUILD | 2 | ||||
| -rw-r--r-- | libre/grub/grub-10_linux-20_linux_xen-detect-parabola-initramfs.patch | 24 |
2 files changed, 22 insertions, 4 deletions
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index dd2a26c94..25bed2443 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -86,7 +86,7 @@ md5sums=('SKIP' 'SKIP' '728b7439ac733a7c0d56049adec364c7' 'SKIP' - '55f2290e5768d0d59a3e5f7ad83324bc' + '3a9bb9bafe0062388e11f72f0e80ba7e' 'e506ae4a9f9f7d1b765febfa84e10d48' 'be55eabc102f2c60b38ed35c203686d6' '8d1dd54ae4a1b550c097e056892ce953' diff --git a/libre/grub/grub-10_linux-20_linux_xen-detect-parabola-initramfs.patch b/libre/grub/grub-10_linux-20_linux_xen-detect-parabola-initramfs.patch index 49ee47159..8184871b5 100644 --- a/libre/grub/grub-10_linux-20_linux_xen-detect-parabola-initramfs.patch +++ b/libre/grub/grub-10_linux-20_linux_xen-detect-parabola-initramfs.patch @@ -1,6 +1,6 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in --- a/util/grub.d/10_linux.in 2015-09-27 14:14:45.544730230 -0300 -+++ b/util/grub.d/10_linux.in 2015-09-27 14:44:29.727866307 -0300 ++++ b/util/grub.d/10_linux.in 2015-09-27 15:34:19.822404966 -0300 @@ -80,9 +80,11 @@ if [ x$type != xsimple ] ; then case $type in @@ -15,6 +15,15 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in esac if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" +@@ -94,7 +96,7 @@ + else + echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" + fi +- if [ x$type != xrecovery ] ; then ++ if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then + save_default_entry | grub_add_tab + fi + @@ -126,7 +128,7 @@ fi printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" @@ -54,14 +63,14 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in "single ${GRUB_CMDLINE_LINUX}" diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in --- a/util/grub.d/20_linux_xen.in 2015-09-27 14:14:45.544730230 -0300 -+++ b/util/grub.d/20_linux_xen.in 2015-09-27 14:55:33.602636996 -0300 ++++ b/util/grub.d/20_linux_xen.in 2015-09-27 15:35:00.589739244 -0300 @@ -88,9 +88,11 @@ fi if [ x$type != xsimple ] ; then if [ x$type = xrecovery ] ; then - title="$(gettext_printf "%s, with Xen %s and Linux %s (recovery mode)" "${os}" "${xen_version}" "${version}")" + title="$(gettext_printf "%s, with Xen %s and %s kernel (recovery mode)" "${os}" "${xen_version}" "${version}")" -+ if [ x$type = xfallback ] ; then ++ elif [ x$type = xfallback ] ; then + title="$(gettext_printf "%s, with Xen %s and %s kernel (fallback initramfs)" "${os}" "${xen_version}" "${version}")" else - title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")" @@ -69,6 +78,15 @@ diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in fi replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" if [ x"Xen ${xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then +@@ -103,7 +105,7 @@ + title="$(gettext_printf "%s, with Xen hypervisor" "${os}")" + echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" + fi +- if [ x$type != xrecovery ] ; then ++ if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then + save_default_entry | grub_add_tab | sed "s/^/$submenu_indentation/" + fi + @@ -112,7 +114,7 @@ fi printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" |