diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-11-11 00:06:33 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-11-11 00:06:33 -0200 |
| commit | ede60ed00d4c781adadca99ddef19be1bf56e8aa (patch) | |
| tree | 636b38df2c2783c1ba3faec2b90493d8d84d219f | |
| parent | a0da0a23ea0b962755b462477c46dd2ab34163ab (diff) | |
grub-1:2.02.beta2-5.parabola1: updating revision from Arch
* fix grub-10_linux-detect-parabola-initramfs.patch to reduce issues with entries
| -rw-r--r-- | libre/grub/PKGBUILD | 4 | ||||
| -rw-r--r-- | libre/grub/grub-10_linux-detect-parabola-initramfs.patch | 15 |
2 files changed, 14 insertions, 5 deletions
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 42a40d11d..eaedf77ad 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -24,7 +24,7 @@ _UNIFONT_VER="6.3.20131217" pkgname="grub" pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)" pkgver=2.02.beta2 -pkgrel=4.parabola2 +pkgrel=5.parabola1 epoch="1" url="https://www.gnu.org/software/grub/" arch=('x86_64' 'i686') @@ -68,7 +68,7 @@ md5sums=('SKIP' 'SKIP' '728b7439ac733a7c0d56049adec364c7' 'SKIP' - '181a39ebcc4f86e229c49007d3c7618d' + 'df4c560c566bf5b21d122990cbc85a38' 'e506ae4a9f9f7d1b765febfa84e10d48' 'be55eabc102f2c60b38ed35c203686d6' '8d1dd54ae4a1b550c097e056892ce953' diff --git a/libre/grub/grub-10_linux-detect-parabola-initramfs.patch b/libre/grub/grub-10_linux-detect-parabola-initramfs.patch index f35648a6b..b486374e4 100644 --- a/libre/grub/grub-10_linux-detect-parabola-initramfs.patch +++ b/libre/grub/grub-10_linux-detect-parabola-initramfs.patch @@ -16,13 +16,22 @@ index 00d1931..7d4086b 100644 case $type in recovery) - title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; -+ title="$(gettext_printf "%s, with %s (recovery mode)" "${os}" "${version}")" ;; ++ title="$(gettext_printf "%s, %s kernel (recovery mode)" "${os}" "${version}")" ;; + fallback) -+ title="$(gettext_printf "%s, with %s (fallback initramfs)" "${os}" "${version}")" ;; ++ title="$(gettext_printf "%s, %s kernel (fallback initramfs)" "${os}" "${version}")" ;; *) - title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; -+ title="$(gettext_printf "%s, with %s" "${os}" "${version}")" ;; ++ title="$(gettext_printf "%s, %s kernel" "${os}" "${version}")" ;; esac +@@ -126,7 +128,7 @@ while [ "x$list" != "x" ] ; do + fi + printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" + fi +- message="$(gettext_printf "Loading Linux %s ..." ${version})" ++ message="$(gettext_printf "Loading %s kernel ..." ${version})" + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$message" | grub_quote)' + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} @@ -180,7 +182,7 @@ while [ "x$list" != "x" ] ; do basename=`basename $linux` dirname=`dirname $linux` |