jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

grub: simplify and remove unused stuff in postinst kernel hook.

Browse source
This commit is contained in:
Juan RP 2012-12-14 12:57:48 +01:00
parent 1e4e559f04
commit abdacff0b0
2 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
srcpkgs/grub/files/kernel.d/grub.post
View file

@ -7,25 +7,9 @@
PKGNAME="$1" PKGNAME="$1"
VERSION="$2" VERSION="$2"
[ -r boot/grub/grub.cfg ] \ if command -v grub-mkconfig >/dev/null 2>&1; then
&& groot=$(awk '/^set root=/{print substr($2, 8, 3); exit}' \ if [ -d $ROOTDIR/boot/grub ]; then
boot/grub/grub.cfg) grub-mkconfig -o $ROOTDIR/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
exit $? exit $?
fi fi
fi fi

2
srcpkgs/grub/template
View file

@ -1,7 +1,7 @@
# Template file for 'grub' # Template file for 'grub'
pkgname=grub pkgname=grub
version="2.00" version="2.00"
revision=7 revision=8
short_desc="GRand Unified Bootloader 2" short_desc="GRand Unified Bootloader 2"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3" license="GPL-3"