From abdacff0b09e37c43e295852b15195b448a18d3d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 14 Dec 2012 12:57:48 +0100 Subject: [PATCH] grub: simplify and remove unused stuff in postinst kernel hook. --- srcpkgs/grub/files/kernel.d/grub.post | 22 +++------------------- srcpkgs/grub/template | 2 +- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/srcpkgs/grub/files/kernel.d/grub.post b/srcpkgs/grub/files/kernel.d/grub.post index 6d46fb4815b..f28257d999d 100644 --- a/srcpkgs/grub/files/kernel.d/grub.post +++ b/srcpkgs/grub/files/kernel.d/grub.post @@ -7,25 +7,9 @@ PKGNAME="$1" VERSION="$2" -[ -r boot/grub/grub.cfg ] \ - && groot=$(awk '/^set root=/{print substr($2, 8, 3); exit}' \ - boot/grub/grub.cfg) -[ -e boot/grub/device.map ] && [ -n "${groot}" ] \ - && dev=$(awk "/${groot}/{ print \$NF}" boot/grub/device.map) - -if [ -n "$dev" -a -r "$dev" ]; then - dd if="${dev}" bs=512 skip=0 count=1 2>/dev/null|grep -q GRUB - [ $? -eq 0 ] && grub_installed=1 -fi - -if [ -z "$dev" -a -z "$grub_installed" ]; then - exit 0 -elif [ -n "$dev" -a -z "$grub_installed" ]; then - echo "WARNING: GRUB2 has not been installed into $dev." - echo "WARNING: please run 'grub-install $dev'." -else - if command -v grub-mkconfig >/dev/null 2>&1; then - grub-mkconfig -o boot/grub/grub.cfg +if command -v grub-mkconfig >/dev/null 2>&1; then + if [ -d $ROOTDIR/boot/grub ]; then + grub-mkconfig -o $ROOTDIR/boot/grub/grub.cfg exit $? fi fi diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template index c23642f1a60..1ab964465e8 100644 --- a/srcpkgs/grub/template +++ b/srcpkgs/grub/template @@ -1,7 +1,7 @@ # Template file for 'grub' pkgname=grub version="2.00" -revision=7 +revision=8 short_desc="GRand Unified Bootloader 2" maintainer="Juan RP " license="GPL-3"