From f3c2daf62cb8650fc42b36aa1625fb5995066f0a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 18 May 2010 02:06:35 +0200 Subject: [PATCH] initramfs-tools: update to 0.99.2. - Fixed an error in run_bootloader() that failed to detect the device where GRUB should be installed. - Use command -v to detect presence of grub-mkconfig. --- srcpkgs/initramfs-tools/files/update-initramfs | 6 +++--- srcpkgs/initramfs-tools/template | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/initramfs-tools/files/update-initramfs b/srcpkgs/initramfs-tools/files/update-initramfs index fc543d4ba58..9b8d82dd992 100755 --- a/srcpkgs/initramfs-tools/files/update-initramfs +++ b/srcpkgs/initramfs-tools/files/update-initramfs @@ -165,7 +165,7 @@ run_bootloader() local grub_installed [ -r /boot/grub/grub.cfg ] \ - && groot=$(awk '/^set root=/{print substr($2, 7, 3); exit}' \ + && 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) @@ -180,8 +180,8 @@ run_bootloader() echo "update-initramfs: please run 'grub-install ${dev}'." fi - if [ -x /usr/sbin/grub-mkconfig ]; then - /usr/sbin/grub-mkconfig -o /boot/grub/grub.cfg + if command -v grub-mkconfig 2>&1 >/dev/null; then + grub-mkconfig -o /boot/grub/grub.cfg fi } diff --git a/srcpkgs/initramfs-tools/template b/srcpkgs/initramfs-tools/template index 98e55ce2b3a..a91a183b3f0 100644 --- a/srcpkgs/initramfs-tools/template +++ b/srcpkgs/initramfs-tools/template @@ -1,6 +1,6 @@ # Template file for 'initramfs-tools' pkgname=initramfs-tools -version=0.99.1.debian0.94.4 +version=0.99.2.debian0.94.4 build_style=custom-install short_desc="Tools for generating an initramfs" maintainer="Juan RP "