diff options
author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-06-26 04:05:55 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-06-26 04:05:55 -0300 |
commit | fce1580b63172a287542e466ccae368960a9b0e0 (patch) | |
tree | 270ba861dd67b85af13f5344d95f4012b31056fd /libre/grub/parabola_grub_mkconfig_fixes.patch | |
parent | 46eacf9a22d91ab3b04c7b0d2b42b51069dbeced (diff) | |
download | abslibre-fce1580b63172a287542e466ccae368960a9b0e0.tar.gz abslibre-fce1580b63172a287542e466ccae368960a9b0e0.tar.bz2 abslibre-fce1580b63172a287542e466ccae368960a9b0e0.zip |
grub-2.00.5043-1: updating version, build latest bzr snapshot, fixes gcc issues on efi boot
Diffstat (limited to 'libre/grub/parabola_grub_mkconfig_fixes.patch')
-rw-r--r-- | libre/grub/parabola_grub_mkconfig_fixes.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch index 5324afa01..fbcca19ec 100644 --- a/libre/grub/parabola_grub_mkconfig_fixes.patch +++ b/libre/grub/parabola_grub_mkconfig_fixes.patch @@ -1,8 +1,8 @@ diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 516be86..5f37db2 100644 +index 8decc1d..170047f 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in -@@ -213,6 +213,8 @@ export GRUB_DEFAULT \ +@@ -212,6 +212,8 @@ export GRUB_DEFAULT \ GRUB_THEME \ GRUB_GFXPAYLOAD_LINUX \ GRUB_DISABLE_OS_PROBER \ @@ -12,10 +12,10 @@ index 516be86..5f37db2 100644 GRUB_SAVEDEFAULT \ GRUB_ENABLE_CRYPTODISK \ diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index 765bfdc..b148558 100644 +index 2c4bb0a..c7120d2 100644 --- a/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in -@@ -115,6 +115,14 @@ cat <<EOF +@@ -125,6 +125,14 @@ cat <<EOF EOF @@ -64,7 +64,7 @@ index 14402e8..e85f7d6 100644 fi - if [ x$type != xrecovery ] ; then + if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then - save_default_entry | sed -e "s/^/\t/" + save_default_entry | grub_add_tab fi @@ -132,7 +140,8 @@ linux_entry () @@ -75,7 +75,7 @@ index 14402e8..e85f7d6 100644 + + message="$(gettext_printf "Loading Linux %s ..." "${version}")" sed "s/^/$submenu_indentation/" << EOF - echo '$message' + echo '$(echo "$message" | grub_quote)' linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} @@ -190,7 +199,22 @@ while [ "x$list" != "x" ] ; do alt_version=`echo $version | sed -e "s,\.old$,,g"` |