diff --git a/PKGBUILD b/PKGBUILD index 87c2b57..7f784f8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -22,12 +22,12 @@ _UNIFONT_VER="6.3.20131217" pkgname="grub" pkgdesc="GNU GRand Unified Bootloader (2)" pkgver=2.02.beta2 -pkgrel=5 +pkgrel=6 epoch="1" url="https://www.gnu.org/software/grub/" arch=('x86_64' 'i686') license=('GPL3') -backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom') +backup=('etc/default/grub' 'etc/grub.d/40_custom') install="${pkgname}.install" options=('!makeflags') @@ -60,8 +60,7 @@ source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#tag=${_GRUB_GIT_TAG} 'grub-intel-ucode.patch' 'grub-add-GRUB_COLOR_variables.patch' '60_memtest86+' - 'grub.default' - 'grub.cfg') + 'grub.default') md5sums=('SKIP' 'SKIP' @@ -71,8 +70,7 @@ md5sums=('SKIP' 'a678629bc82c4e70c48d28242036d1d7' 'e506ae4a9f9f7d1b765febfa84e10d48' 'be55eabc102f2c60b38ed35c203686d6' - 'a03ffd56324520393bf574cefccb893d' - 'c8b9511586d57d6f2524ae7898397a46') + 'a5187c4401f9b7e94af5d3bc4ece3814') _pkgver() { cd "${srcdir}/grub-${_pkgver}/" @@ -100,7 +98,7 @@ prepare() { sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub-${_pkgver}/configure.ac" msg "Fix mkinitcpio 'rw' FS#36275" - sed 's| ro | rw |g' -i "${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in" + sed 's| ro | |g' -i "${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in" msg "Fix OS naming FS#33393" sed 's|GNU/Linux|Linux|' -i "${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in" @@ -329,8 +327,8 @@ _package_grub-common_and_bios() { msg "Install /etc/default/grub (used by grub-mkconfig)" install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" - msg "Install grub.cfg for backup array" - install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg" + msg "Install /boot/grub for grub-mkconfig" + install -d "${pkgdir}/boot/grub" } diff --git a/grub.default b/grub.default index fdd1fc3..bf61682 100644 --- a/grub.default +++ b/grub.default @@ -2,7 +2,7 @@ GRUB_DEFAULT=0 GRUB_TIMEOUT=5 GRUB_DISTRIBUTOR="Arch" GRUB_CMDLINE_LINUX_DEFAULT="quiet" -GRUB_CMDLINE_LINUX="" +GRUB_CMDLINE_LINUX="rw" # Preload both GPT and MBR modules so that they are not missed GRUB_PRELOAD_MODULES="part_gpt part_msdos" diff --git a/grub.install b/grub.install index 9188b35..762e898 100644 --- a/grub.install +++ b/grub.install @@ -2,19 +2,6 @@ infodir="usr/share/info" filelist=('grub.info' 'grub-dev.info') post_install() { - if [ -f /boot/grub/grub.cfg.pacsave ]; then - echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg" - install -D -m0644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg - fi - - cat << 'EOM' -Generating grub.cfg.example config file... -This may fail on some machines running a custom kernel. -EOM - - grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null - echo "done." - for file in ${filelist[@]}; do install-info ${infodir}/${file}.gz ${infodir}/dir 2> /dev/null done