upgpkg: 0.97-20

FS#25442 grub-install doesn't work on i686; add xfsprogs to optdepends and add check for it in install-grub script
This commit is contained in:
Ronald van Haren
2011-08-08 17:30:51 +00:00
parent 5d98dd0d5a
commit c8d4b86548
2 changed files with 9 additions and 9 deletions

View File

@ -160,8 +160,8 @@ dogrub() {
# freeze xfs filesystems to enable grub installation on xfs filesystems
if [ -x /usr/sbin/xfs_freeze ]; then
/usr/sbin/xfs_freeze -f /boot > /dev/null 2>&1
/usr/sbin/xfs_freeze -f / > /dev/null 2>&1
[ "$(stat -fLc %T /boot)" == "xfs" ] && /usr/sbin/xfs_freeze -f /boot > /dev/null 2>&1
[ "$(stat -fLc %T /)" == "xfs" ] && /usr/sbin/xfs_freeze -f / > /dev/null 2>&1
fi
# look for a separately-mounted /boot partition
@ -187,8 +187,8 @@ EOF
# unfreeze xfs filesystems
if [ -x /usr/sbin/xfs_freeze ]; then
/usr/sbin/xfs_freeze -u /boot > /dev/null 2>&1
/usr/sbin/xfs_freeze -u / > /dev/null 2>&1
[ "$(stat -fLc %T /boot)" == "xfs" ] && /usr/sbin/xfs_freeze -u /boot > /dev/null 2>&1
[ "$(stat -fLc %T /)" == "xfs" ] && /usr/sbin/xfs_freeze -u / > /dev/null 2>&1
fi
if grep "Error [0-9]*: " /tmp/grub.log >/dev/null; then
echo "Error installing GRUB. (see /tmp/grub.log for output)"