Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7e977a84481e2448bbe30bfc6710f27cefc98dc9
commit 7e977a84481e2448bbe30bfc6710f27cefc98dc9 Author: crazy <[email protected]> Date: Thu Jul 28 14:13:47 2016 +0200 grub2-2.02-4-x86_64 * added patch to use just menus for now since submenu logic * is somewhat broken. Also disabled GRUB_SAVEDEFAULT for btrfs since * also added Linux version string for each menu so we know what we boot. * it does not work for this FS right now. * added xzio to grub's preload modules diff --git a/source/base/grub2/FrugalBuild b/source/base/grub2/FrugalBuild index f7945f5..66fc1d4 100644 --- a/source/base/grub2/FrugalBuild +++ b/source/base/grub2/FrugalBuild @@ -6,7 +6,7 @@ pkgname=grub2 _F_archive_name=grub pkgver=2.02 pkgextraver=-beta3 -pkgrel=3 +pkgrel=4 pkgdesc="The GNU GRand Unified Bootloader" url="http://www.gnu.org/software/grub/"; rodepends=('grub-theme-frugalware' 'scriptlet-core') @@ -104,10 +104,11 @@ source=(http://alpha.gnu.org/gnu/grub/grub-$pkgver${pkgextraver/-/\~}.tar.xz \ 0088-Rework-TPM-measurements.patch 0089-Fix-event-log-prefix.patch uefi_firmware_setup.patch - grub2-frugalware-config.patch ) + grub2-frugalware-config.patch + grub2-frugalware-config2.patch) sha1sums=('14a1f9239a9c974957e835dc706fc6a1e4819c83' \ - 'c1a623db6ffffc42af03197de48200b3b4bb70a1' \ + 'b070489950b87e4a9ca97d4e85db79879daae36a' \ '9de273e2fb3095694e82cf9969de61e994f2bce6' \ '0a5e537237d93b8ef222b72d39e74daf10e24f47' \ '42f362c84ca27f5eb19c905aa43989cf78ae3e4c' \ @@ -188,7 +189,8 @@ sha1sums=('14a1f9239a9c974957e835dc706fc6a1e4819c83' \ '1c5a3756f2a5996cbd948f536e9d28b7291aa514' \ 'a5f92d0b77999d720c0bdf0f22c49aa35019c365' \ '93199e15aa5f3adf7aaca91f1392e444bf25028c' \ - 'af8f6a3114857e97e25b47273ac3b1c952586bbe') + 'af8f6a3114857e97e25b47273ac3b1c952586bbe' \ + '7163020e148b7b3b0a5c9ad4b3456b8782c757ab') subpkgs=('grub2-mkfont') subdescs=('grub2 mkfont utility') diff --git a/source/base/grub2/grub b/source/base/grub2/grub index 15a5221..2aebe7f 100644 --- a/source/base/grub2/grub +++ b/source/base/grub2/grub @@ -21,7 +21,7 @@ GRUB_BACKGROUND="/boot/grub/background.png" #GRUB_THEME="/usr/share/grub/themes/starfield/theme.txt" #GRUB_GFXPAYLOAD_LINUX=keep #GRUB_DISABLE_OS_PROBER=true -#GRUB_PRELOAD_MODULES="" +GRUB_PRELOAD_MODULES="xzio" # This tries to guess the proper platform. (DO NOT EDIT BELOW THIS LINE.) case $(uname -m) in diff --git a/source/base/grub2/grub2-frugalware-config2.patch b/source/base/grub2/grub2-frugalware-config2.patch new file mode 100644 index 0000000..ad4c91f --- /dev/null +++ b/source/base/grub2/grub2-frugalware-config2.patch @@ -0,0 +1,104 @@ +diff -Naur grub-2.02~beta3/util/grub.d/10_linux.in grub-2.02~beta3-p/util/grub.d/10_linux.in +--- grub-2.02~beta3/util/grub.d/10_linux.in 2016-07-28 13:47:14.000819454 +0200 ++++ grub-2.02~beta3-p/util/grub.d/10_linux.in 2016-07-28 13:46:14.364818570 +0200 +@@ -56,6 +56,8 @@ + + case x"$GRUB_FS" in + xbtrfs) ++ ## does not work with this FS ++ GRUB_SAVEDEFAULT=false + rootsubvol="`make_system_path_relative_to_its_root /`" + rootsubvol="${rootsubvol#/}" + if [ "x${rootsubvol}" != x ]; then +@@ -124,24 +126,31 @@ + if [ -z "$boot_device_id" ]; then + boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" + fi +- if [ x$type != xsimple ] ; then +- case $type in +- console) +- title="$(gettext_printf "%s, with Linux %s (console mode)" "${os}" "${version}")" ;; +- recovery) +- title="$(printf "$(mktitle) (recovery mode)" "${version}")" ;; ++ ++ case $type in ++ simple) ++ title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; ++ console) ++ title_c="(console mode)" ++ title_="$(gettext_printf "%s, with Linux %s (console mode)" "${os}" "${version}")" ++ title="${title_} ${title_c}" ;; ++ recovery) ++ title_r="(recovery mode)" ++ title_="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ++ title="${title_} ${title_r}" ;; + *) + title="$(printf "$(mktitle)" "${version}")" ;; +- esac ++ 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')" + quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)" + title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;" + fi +- echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/" ++ if [ x$type != xsimple ] ; then ++ echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/" + else +- echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" +- fi ++ echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" ++ fi + if [ x$type != xrecovery ] ; then + save_default_entry | grub_add_tab + fi +@@ -294,28 +303,40 @@ + GRUB_DISABLE_SUBMENU="true" + fi + ++ ## ok this whole submenu logic is broken we use just menu like ++ ## menu " Frugalware with Linux some_version ++ ## menu " Frugalware with Linux some_other_version and so on + if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then + linux_entry "${OS}" "${version}" simple \ +- "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ ++ linux_entry "${OS}" "${version}" console \ ++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} systemd.unit=multi-user.target" ++ ++ if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then ++ linux_entry "${OS}" "${version}" recovery \ ++ "${GRUB_CMDLINE_LINUX} systemd.unit=rescue.target" ++ fi ++ + +- submenu_indentation="$grub_tab" +- + if [ -z "$boot_device_id" ]; then + boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" + fi ++ ++ else ## we don' use this for now ++ submenu_indentation="$grub_tab" + # TRANSLATORS: %s is replaced with an OS name + echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {" + is_top_level=false +- fi + +- linux_entry "${OS}" "${version}" console \ ++ linux_entry "${OS}" "${version}" console \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} systemd.unit=multi-user.target" + +- if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then +- linux_entry "${OS}" "${version}" recovery \ ++ if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then ++ linux_entry "${OS}" "${version}" recovery \ + "${GRUB_CMDLINE_LINUX} systemd.unit=rescue.target" +- fi +- ++ fi ++fi + list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '` + done + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
