diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2011-08-08 21:06:49 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-08-08 21:06:49 +0200 |
commit | 84c48e50979b56920e2606537abec7bb18ff1c8e (patch) | |
tree | 06a7b4e864f74fee5d18f94cc26c20cb984b8d47 /libre/grub2/parabola-mkconfig.patch | |
parent | 0f0d024626ba041880f5e1b140a409eddb50d3e4 (diff) | |
download | abslibre-84c48e50979b56920e2606537abec7bb18ff1c8e.tar.gz abslibre-84c48e50979b56920e2606537abec7bb18ff1c8e.tar.bz2 abslibre-84c48e50979b56920e2606537abec7bb18ff1c8e.zip |
Fix building grub2 and patch grub-mkconfig to find new kernels.
Symlinks will be ignored when finding files, to not make entries for
compatibility symlinks in new configuration. Version is not included
in menu entry name if it doesn't contain a dot, since it's not useful.
Diffstat (limited to 'libre/grub2/parabola-mkconfig.patch')
-rw-r--r-- | libre/grub2/parabola-mkconfig.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/libre/grub2/parabola-mkconfig.patch b/libre/grub2/parabola-mkconfig.patch new file mode 100644 index 000000000..d9aae8501 --- /dev/null +++ b/libre/grub2/parabola-mkconfig.patch @@ -0,0 +1,51 @@ +diff -ru grub-1.99~rc1-orig/util/grub.d/10_linux.in grub-1.99~rc1/util/grub.d/10_linux.in +--- grub-1.99~rc1-orig/util/grub.d/10_linux.in 2011-08-08 17:03:17.177418423 +0200 ++++ grub-1.99~rc1/util/grub.d/10_linux.in 2011-08-08 19:36:17.307138530 +0200 +@@ -57,12 +57,22 @@ + version="$2" + recovery="$3" + args="$4" +- if ${recovery} ; then +- title="$(gettext_quoted "%s, with Linux %s (recovery mode)")" ++ if echo "$version" | fgrep . ; then ++ if ${recovery} ; then ++ title="$(gettext_quoted "%s, with Linux %s (recovery mode)")" ++ else ++ title="$(gettext_quoted "%s, with Linux %s")" ++ fi ++ printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}" + else +- title="$(gettext_quoted "%s, with Linux %s")" ++ # Parabola GNU/Linux-libre doesn't put kernel version in its file name. ++ if ${recovery} ; then ++ title="$(gettext_quoted "%s (recovery mode)")" ++ else ++ title="%s" ++ fi ++ printf "menuentry '${title}' ${CLASS} {\n" "${os}" + fi +- printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}" + if ! ${recovery} ; then + save_default_entry | sed -e "s/^/\t/" + fi +@@ -123,7 +133,7 @@ + dirname=`dirname $linux` + rel_dirname=`make_system_path_relative_to_its_root $dirname` + version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` +- base_init=`echo $basename | sed -e "s,vmlinuz,kernel,g"` ++ base_init=`echo $basename | sed -e "s,vmlinuz,initramfs,g"` + alt_version="${base_init}-fallback" + linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" + +diff -ru grub-1.99~rc1-orig/util/grub-mkconfig_lib.in grub-1.99~rc1/util/grub-mkconfig_lib.in +--- grub-1.99~rc1-orig/util/grub-mkconfig_lib.in 2011-08-08 17:03:17.177418423 +0200 ++++ grub-1.99~rc1/util/grub-mkconfig_lib.in 2011-08-08 17:04:48.064082390 +0200 +@@ -130,7 +130,7 @@ + + grub_file_is_not_garbage () + { +- if test -f "$1" ; then ++ if test -f "$1" -a ! -L "$1" ; then + case "$1" in + *.dpkg-*) return 1 ;; # debian dpkg + README*) return 1 ;; # documentation |