Date: Monday, May 11, 2020 @ 09:30:09 Author: eworm Revision: 383169 archrelease: copy trunk to testing-x86_64
Added: grub/repos/testing-x86_64/ grub/repos/testing-x86_64/0003-10_linux-detect-archlinux-initramfs.patch (from rev 383168, grub/trunk/0003-10_linux-detect-archlinux-initramfs.patch) grub/repos/testing-x86_64/0004-add-GRUB_COLOR_variables.patch (from rev 383168, grub/trunk/0004-add-GRUB_COLOR_variables.patch) grub/repos/testing-x86_64/0005-grub-install-fix-inverted-test-for-NLS-enabled-when-.patch (from rev 383168, grub/trunk/0005-grub-install-fix-inverted-test-for-NLS-enabled-when-.patch) grub/repos/testing-x86_64/PKGBUILD (from rev 383168, grub/trunk/PKGBUILD) grub/repos/testing-x86_64/grub.default (from rev 383168, grub/trunk/grub.default) grub/repos/testing-x86_64/grub.install (from rev 383168, grub/trunk/grub.install) -----------------------------------------------------------------+ 0003-10_linux-detect-archlinux-initramfs.patch | 41 + 0004-add-GRUB_COLOR_variables.patch | 32 0005-grub-install-fix-inverted-test-for-NLS-enabled-when-.patch | 36 + PKGBUILD | 321 ++++++++++ grub.default | 54 + grub.install | 17 6 files changed, 501 insertions(+) Copied: grub/repos/testing-x86_64/0003-10_linux-detect-archlinux-initramfs.patch (from rev 383168, grub/trunk/0003-10_linux-detect-archlinux-initramfs.patch) =================================================================== --- testing-x86_64/0003-10_linux-detect-archlinux-initramfs.patch (rev 0) +++ testing-x86_64/0003-10_linux-detect-archlinux-initramfs.patch 2020-05-11 09:30:09 UTC (rev 383169) @@ -0,0 +1,41 @@ +diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in +index f5d3e78..ef59c8c 100644 +--- a/util/grub.d/10_linux.in ++++ b/util/grub.d/10_linux.in +@@ -83,6 +83,8 @@ linux_entry () + case $type in + recovery) + title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; ++ fallback) ++ title="$(gettext_printf "%s, with Linux %s (fallback initramfs)" "${os}" "${version}")" ;; + *) + title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; + esac +@@ -186,7 +188,7 @@ while [ "x$list" != "x" ] ; do + basename=`basename $linux` + dirname=`dirname $linux` + rel_dirname=`make_system_path_relative_to_its_root $dirname` +- version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` ++ version=`echo $basename | sed -e "s,vmlinuz-,,g"` + alt_version=`echo $version | sed -e "s,\.old$,,g"` + linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" + +@@ -248,6 +250,18 @@ while [ "x$list" != "x" ] ; do + + linux_entry "${OS}" "${version}" advanced \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ ++ if test -e "${dirname}/initramfs-${version}-fallback.img" ; then ++ initrd="initramfs-${version}-fallback.img" ++ ++ if test -n "${initrd}" ; then ++ gettext_printf "Found fallback initrd image(s) in %s:%s\n" "${dirname}" "${initrd_extra} ${initrd}" >&2 ++ fi ++ ++ linux_entry "${OS}" "${version}" fallback \ ++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ fi ++ + if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then + linux_entry "${OS}" "${version}" recovery \ + "single ${GRUB_CMDLINE_LINUX}" Copied: grub/repos/testing-x86_64/0004-add-GRUB_COLOR_variables.patch (from rev 383168, grub/trunk/0004-add-GRUB_COLOR_variables.patch) =================================================================== --- testing-x86_64/0004-add-GRUB_COLOR_variables.patch (rev 0) +++ testing-x86_64/0004-add-GRUB_COLOR_variables.patch 2020-05-11 09:30:09 UTC (rev 383169) @@ -0,0 +1,32 @@ +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index 3390ba9..c416489 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -218,6 +218,8 @@ export GRUB_DEFAULT \ + GRUB_THEME \ + GRUB_GFXPAYLOAD_LINUX \ + GRUB_DISABLE_OS_PROBER \ ++ GRUB_COLOR_NORMAL \ ++ GRUB_COLOR_HIGHLIGHT \ + GRUB_INIT_TUNE \ + GRUB_SAVEDEFAULT \ + GRUB_ENABLE_CRYPTODISK \ +diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in +index d2e7252..8259f45 100644 +--- a/util/grub.d/00_header.in ++++ b/util/grub.d/00_header.in +@@ -125,6 +125,14 @@ cat <<EOF + + EOF + ++if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then ++ cat << EOF ++set menu_color_normal=$GRUB_COLOR_NORMAL ++set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT ++ ++EOF ++fi ++ + serial=0; + gfxterm=0; + for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do Copied: grub/repos/testing-x86_64/0005-grub-install-fix-inverted-test-for-NLS-enabled-when-.patch (from rev 383168, grub/trunk/0005-grub-install-fix-inverted-test-for-NLS-enabled-when-.patch) =================================================================== --- testing-x86_64/0005-grub-install-fix-inverted-test-for-NLS-enabled-when-.patch (rev 0) +++ testing-x86_64/0005-grub-install-fix-inverted-test-for-NLS-enabled-when-.patch 2020-05-11 09:30:09 UTC (rev 383169) @@ -0,0 +1,36 @@ +From ee855b15ff185bad3b0495500ab234b9cab7436c Mon Sep 17 00:00:00 2001 +From: Martin Whitaker <f...@martin-whitaker.me.uk> +Date: Mon, 24 Feb 2020 22:11:29 +0000 +Subject: [PATCH] grub-install: fix inverted test for NLS enabled when copying + locales. + +Commit 3d8439da8c9a4acf9bc1c41b364ec6e1680ef052 attempted to avoid +copying locale files to the target directory when NLS was disabled. +However the test is inverted, and it does the opposite. + +Signed-off-by: Martin Whitaker <f...@martin-whitaker.me.uk> + +diff --git a/util/grub-install-common.c b/util/grub-install-common.c +index ca0ac612a..f53bf0694 100644 +--- a/util/grub-install-common.c ++++ b/util/grub-install-common.c +@@ -598,7 +598,7 @@ copy_all (const char *srcd, + grub_util_fd_closedir (d); + } + +-#if !(defined (GRUB_UTIL) && defined(ENABLE_NLS) && ENABLE_NLS) ++#if (defined (GRUB_UTIL) && defined(ENABLE_NLS) && ENABLE_NLS) + static const char * + get_localedir (void) + { +@@ -659,7 +659,7 @@ static void + grub_install_copy_nls(const char *src __attribute__ ((unused)), + const char *dst __attribute__ ((unused))) + { +-#if !(defined (GRUB_UTIL) && defined(ENABLE_NLS) && ENABLE_NLS) ++#if (defined (GRUB_UTIL) && defined(ENABLE_NLS) && ENABLE_NLS) + char *dst_locale; + + dst_locale = grub_util_path_concat (2, dst, "locale"); +-- +2.21.1 Copied: grub/repos/testing-x86_64/PKGBUILD (from rev 383168, grub/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2020-05-11 09:30:09 UTC (rev 383169) @@ -0,0 +1,321 @@ +# Maintainer : Christian Hesse <m...@eworm.de> +# Maintainer : Ronald van Haren <ronald.archlinux.org> +# Contributor: Tobias Powalowski <tp...@archlinux.org> +# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> + +## "1" to enable IA32-EFI build in Arch x86_64, "0" to disable +_IA32_EFI_IN_ARCH_X64="1" + +## "1" to enable EMU build, "0" to disable +_GRUB_EMU_BUILD="0" + +_GRUB_EXTRAS_COMMIT="8a245d5c1800627af4cefa99162a89c7a46d8842" +_GNULIB_COMMIT="be584c56eb1311606e5ea1a36363b97bddb6eed3" +_UNIFONT_VER="12.1.03" + +[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64" +[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386" + +[[ "${CARCH}" == "x86_64" ]] && _EMU_ARCH="x86_64" +[[ "${CARCH}" == "i686" ]] && _EMU_ARCH="i386" + +pkgname='grub' +pkgdesc='GNU GRand Unified Bootloader (2)' +_pkgver=2.04 +pkgver=${_pkgver/-/} +pkgrel=7 +epoch=2 +url='https://www.gnu.org/software/grub/' +arch=('x86_64') +license=('GPL3') +backup=('etc/default/grub' + 'etc/grub.d/40_custom') +install="${pkgname}.install" +options=('!makeflags') + +conflicts=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-legacy') +replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}") +provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}") + +makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen' + 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse2') +depends=('sh' 'xz' 'gettext' 'device-mapper') +optdepends=('freetype2: For grub-mkfont usage' + 'fuse2: For grub-mount usage' + 'dosfstools: For grub-mkrescue FAT FS and EFI support' + 'efibootmgr: For grub-install EFI support' + 'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue' + 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' + 'mtools: For grub-mkrescue FAT FS support') + +if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then + makedepends+=('libusbx' 'sdl') + optdepends+=('libusbx: For grub-emu USB support' + 'sdl: For grub-emu SDL support') +fi + +validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' Serbinenko <phco...@gmail.com> + 'BE5C23209ACDDACEB20DB0A28C8189F1988C2166' # Daniel Kiper <dki...@net-space.pl> + '95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy <unifoun...@unifoundry.com> + +source=("git+https://git.savannah.gnu.org/git/grub.git#tag=grub-${_pkgver}?signed" + "git+https://git.savannah.gnu.org/git/grub-extras.git#commit=${_GRUB_EXTRAS_COMMIT}" + "git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_GNULIB_COMMIT}" + "https://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz"{,.sig} + '0003-10_linux-detect-archlinux-initramfs.patch' + '0004-add-GRUB_COLOR_variables.patch' + '0005-grub-install-fix-inverted-test-for-NLS-enabled-when-.patch' + 'grub.default') + +sha256sums=('SKIP' + 'SKIP' + 'SKIP' + '6067bda8daa1f3c49d8876107992e19fc9ab905ad54c01c3131b9649977c3746' + 'SKIP' + '171415ab075d1ac806f36c454feeb060f870416f24279b70104bba94bd6076d4' + 'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29' + '06820004912a3db195a76e68b376fce1ba6507ac740129f0b99257ef07aba1ea' + '690adb7943ee9fedff578a9d482233925ca3ad3e5a50fffddd27cf33300a89e3') + +_backports=( + # grub-mkconfig: Use portable "command -v" to detect installed programs + '28a7e597de0d5584f65e36f9588ff9041936e617' +) + +_configure_options=( + FREETYPE="pkg-config freetype2" + BUILD_FREETYPE="pkg-config freetype2" + --enable-mm-debug + --enable-nls + --enable-device-mapper + --enable-cache-stats + --enable-grub-mkfont + --enable-grub-mount + --prefix="/usr" + --bindir="/usr/bin" + --sbindir="/usr/bin" + --mandir="/usr/share/man" + --infodir="/usr/share/info" + --datarootdir="/usr/share" + --sysconfdir="/etc" + --program-prefix="" + --with-bootdir="/boot" + --with-grubdir="grub" + --disable-silent-rules + --disable-werror +) + +prepare() { + cd "${srcdir}/grub/" + + echo "Apply backports..." + local _c + for _c in "${_backports[@]}"; do + git log --oneline -1 "${_c}" + git cherry-pick -n "${_c}" + done + + echo "Patch to detect of Arch Linux initramfs images by grub-mkconfig..." + patch -Np1 -i "${srcdir}/0003-10_linux-detect-archlinux-initramfs.patch" + + echo "Patch to enable GRUB_COLOR_* variables in grub-mkconfig..." + ## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html + patch -Np1 -i "${srcdir}/0004-add-GRUB_COLOR_variables.patch" + + echo "Patch to NLS installation..." + patch -Np1 -i "${srcdir}/0005-grub-install-fix-inverted-test-for-NLS-enabled-when-.patch" + + echo "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..." + sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac" + + echo "Fix mkinitcpio 'rw' FS#36275..." + sed 's| ro | rw |g' -i "util/grub.d/10_linux.in" + + echo "Fix OS naming FS#33393..." + sed 's|GNU/Linux|Linux|' -i "util/grub.d/10_linux.in" + + echo "Pull in latest language files..." + ./linguas.sh + + echo "Avoid problem with unifont during compile of grub..." + # http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847 + gzip -cd "${srcdir}/unifont-${_UNIFONT_VER}.bdf.gz" > "unifont.bdf" + + echo "Run bootstrap..." + ./bootstrap \ + --gnulib-srcdir="${srcdir}/gnulib/" \ + --no-git + + echo "Make translations reproducible..." + sed -i '1i /^PO-Revision-Date:/ d' po/*.sed +} + +_build_grub-common_and_bios() { + echo "Set ARCH dependent variables for bios build..." + if [[ "${CARCH}" == 'x86_64' ]]; then + _EFIEMU="--enable-efiemu" + else + _EFIEMU="--disable-efiemu" + fi + + echo "Copy the source for building the bios part..." + cp -r "${srcdir}/grub/" "${srcdir}/grub-bios/" + cd "${srcdir}/grub-bios/" + + echo "Add the grub-extra sources for bios build..." + install -d "${srcdir}/grub-bios/grub-extras" + cp -r "${srcdir}/grub-extras/915resolution" \ + "${srcdir}/grub-bios/grub-extras/915resolution" + export GRUB_CONTRIB="${srcdir}/grub-bios/grub-extras/" + + echo "Unset all compiler FLAGS for bios build..." + unset CFLAGS + unset CPPFLAGS + unset CXXFLAGS + unset LDFLAGS + unset MAKEFLAGS + + echo "Run ./configure for bios build..." + ./configure \ + --with-platform="pc" \ + --target="i386" \ + "${_EFIEMU}" \ + --enable-boot-time \ + "${_configure_options[@]}" + + if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then + echo "Make info pages reproducible..." + touch -d "@${SOURCE_DATE_EPOCH}" $(find -name '*.texi') + fi + + echo "Run make for bios build..." + make +} + +_build_grub-efi() { + echo "Copy the source for building the ${_EFI_ARCH} efi part..." + cp -r "${srcdir}/grub/" "${srcdir}/grub-efi-${_EFI_ARCH}/" + cd "${srcdir}/grub-efi-${_EFI_ARCH}/" + + echo "Unset all compiler FLAGS for ${_EFI_ARCH} efi build..." + unset CFLAGS + unset CPPFLAGS + unset CXXFLAGS + unset LDFLAGS + unset MAKEFLAGS + + echo "Run ./configure for ${_EFI_ARCH} efi build..." + ./configure \ + --with-platform="efi" \ + --target="${_EFI_ARCH}" \ + --disable-efiemu \ + --enable-boot-time \ + "${_configure_options[@]}" + + echo "Run make for ${_EFI_ARCH} efi build..." + make +} + +_build_grub-emu() { + echo "Copy the source for building the emu part..." + cp -r "${srcdir}/grub/" "${srcdir}/grub-emu/" + cd "${srcdir}/grub-emu/" + + echo "Unset all compiler FLAGS for emu build..." + unset CFLAGS + unset CPPFLAGS + unset CXXFLAGS + unset LDFLAGS + unset MAKEFLAGS + + echo "Run ./configure for emu build..." + ./configure \ + --with-platform="emu" \ + --target="${_EMU_ARCH}" \ + --enable-grub-emu-usb=no \ + --enable-grub-emu-sdl=no \ + --disable-grub-emu-pci \ + "${_configure_options[@]}" + + echo "Run make for emu build..." + make +} + +build() { + cd "${srcdir}/grub/" + + echo "Build grub bios stuff..." + _build_grub-common_and_bios + + echo "Build grub ${_EFI_ARCH} efi stuff..." + _build_grub-efi + + if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then + echo "Build grub i386 efi stuff..." + _EFI_ARCH="i386" _build_grub-efi + fi + + if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then + echo "Build grub emu stuff..." + _build_grub-emu + fi +} + +_package_grub-common_and_bios() { + cd "${srcdir}/grub-bios/" + + echo "Run make install for bios build..." + make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install + + echo "Remove gdb debugging related files for bios build..." + rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true + rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true + rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true + + echo "Install /etc/default/grub (used by grub-mkconfig)..." + install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" +} + +_package_grub-efi() { + cd "${srcdir}/grub-efi-${_EFI_ARCH}/" + + echo "Run make install for ${_EFI_ARCH} efi build..." + make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install + + echo "Remove gdb debugging related files for ${_EFI_ARCH} efi build..." + rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true + rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true + rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true +} + +_package_grub-emu() { + cd "${srcdir}/grub-emu/" + + echo "Run make install for emu build..." + make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install + + echo "Remove gdb debugging related files for emu build..." + rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.module || true + rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.image || true + rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/{kernel.exec,gdb_grub,gmodule.pl} || true +} + +package() { + cd "${srcdir}/grub/" + + echo "Package grub ${_EFI_ARCH} efi stuff..." + _package_grub-efi + + if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then + echo "Package grub i386 efi stuff..." + _EFI_ARCH="i386" _package_grub-efi + fi + + if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then + echo "Package grub emu stuff..." + _package_grub-emu + fi + + echo "Package grub bios stuff..." + _package_grub-common_and_bios +} Copied: grub/repos/testing-x86_64/grub.default (from rev 383168, grub/trunk/grub.default) =================================================================== --- testing-x86_64/grub.default (rev 0) +++ testing-x86_64/grub.default 2020-05-11 09:30:09 UTC (rev 383169) @@ -0,0 +1,54 @@ +# GRUB boot loader configuration + +GRUB_DEFAULT=0 +GRUB_TIMEOUT=5 +GRUB_DISTRIBUTOR="Arch" +GRUB_CMDLINE_LINUX_DEFAULT="loglevel=3 quiet" +GRUB_CMDLINE_LINUX="" + +# Preload both GPT and MBR modules so that they are not missed +GRUB_PRELOAD_MODULES="part_gpt part_msdos" + +# Uncomment to enable booting from LUKS encrypted devices +#GRUB_ENABLE_CRYPTODISK=y + +# Set to 'countdown' or 'hidden' to change timeout behavior, +# press ESC key to display menu. +GRUB_TIMEOUT_STYLE=menu + +# Uncomment to use basic console +GRUB_TERMINAL_INPUT=console + +# Uncomment to disable graphical terminal +#GRUB_TERMINAL_OUTPUT=console + +# The resolution used on graphical terminal +# note that you can use only modes which your graphic card supports via VBE +# you can see them in real GRUB with the command `vbeinfo' +GRUB_GFXMODE=auto + +# Uncomment to allow the kernel use the same resolution used by grub +GRUB_GFXPAYLOAD_LINUX=keep + +# Uncomment if you want GRUB to pass to the Linux kernel the old parameter +# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" +#GRUB_DISABLE_LINUX_UUID=true + +# Uncomment to disable generation of recovery mode menu entries +GRUB_DISABLE_RECOVERY=true + +# Uncomment and set to the desired menu colors. Used by normal and wallpaper +# modes only. Entries specified as foreground/background. +#GRUB_COLOR_NORMAL="light-blue/black" +#GRUB_COLOR_HIGHLIGHT="light-cyan/blue" + +# Uncomment one of them for the gfx desired, a image background or a gfxtheme +#GRUB_BACKGROUND="/path/to/wallpaper" +#GRUB_THEME="/path/to/gfxtheme" + +# Uncomment to get a beep at GRUB start +#GRUB_INIT_TUNE="480 440 1" + +# Uncomment to make GRUB remember the last selection. This requires +# setting 'GRUB_DEFAULT=saved' above. +#GRUB_SAVEDEFAULT="true" Copied: grub/repos/testing-x86_64/grub.install (from rev 383168, grub/trunk/grub.install) =================================================================== --- testing-x86_64/grub.install (rev 0) +++ testing-x86_64/grub.install 2020-05-11 09:30:09 UTC (rev 383169) @@ -0,0 +1,17 @@ +#!/bin/sh + +post_upgrade() { + # We used to package /boot/grub/grub.cfg, but there is no reason to. + # Remove the file from package, but move real file back in place. + if [ ! -f /boot/grub/grub.cfg -a -f /boot/grub/grub.cfg.pacsave ]; then + mv /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg + fi +} + +post_install() { + cat << 'EOM' +Generate your bootloader configuration with: + grub-mkconfig -o /boot/grub/grub.cfg +EOM +} +