From 4a8369b55e5cf2fa1efeda9eed42856c57950c33 Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman@fedoraproject.org>
Date: Wed, 22 Aug 2007 15:14:11 +0000
Subject: [PATCH] Resolves: bz 252170

---
 kexec-tools.spec |  5 ++++-
 mkdumprd         | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/kexec-tools.spec b/kexec-tools.spec
index 0620746..134d80f 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 79%{?dist}
+Release: 80%{?dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -252,6 +252,9 @@ rm -f %{_datadir}/firstboot/modules/firstboot_kdump.py
 %doc kexec-kdump-howto.txt
 
 %changelog
+* Wed Aug 22 2007 Neil Horman <nhorman@redhat.com> - 1.101-80
+- Fix ability to determine space on nfs shares (bz 252170)
+
 * Tue Aug 21 2007 Neil Horman <nhorman@redhat.com> - 1.101-79
 - Update kdump.init to always create sparse files (bz 253714)
 
diff --git a/mkdumprd b/mkdumprd
index f290931..5b6320b 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -1475,7 +1475,7 @@ if [ -n "$KDUMP_CONFIG_FILE" ]; then
                     available_size=$(fdisk -s $location)
                     if [ $available_size -lt $memtotal ]; then
                         echo "Warning: There is not space enough to save a vmcore."
-                        echo "         The size of $location should be much greater than $memtotal bytes."
+                        echo "         The size of $config_val should be much greater than $memtotal kilo bytes."
                     fi
 
                     #setup raw case
@@ -1543,7 +1543,7 @@ if [ -n "$KDUMP_CONFIG_FILE" ]; then
                                    "Bad NFS mount $location"
                         mkdir -p $tmnt/$SAVE_PATH
                         tdir=`mktemp -dqp $tmnt/$SAVE_PATH`
-                        available_size=$(df $tdir | tail -1 | tr -s ' ' ':' | cut -d: -f4)
+                        available_size=$(df -P $tdir | tail -1 | tr -s ' ' ':' | cut -d: -f5)
 
                         rc=$? && rm -rf $tdir 
                         umount $tmnt
@@ -1564,7 +1564,7 @@ if [ -n "$KDUMP_CONFIG_FILE" ]; then
                         #check for available size is greater than $memtotal
                         if [ $available_size -lt $memtotal ]; then
                             echo "Warning: There is not space enough to save a vmcore."
-                            echo "         The size of $location should be much greater than $memtotal bytes."
+                            echo "         The size of $location should be much greater than $memtotal kilo bytes."
                         fi
     
                         #setup nfs case
@@ -1602,7 +1602,7 @@ if [ -n "$KDUMP_CONFIG_FILE" ]; then
                         #check for available size is greater than $memtotal
                         if [ $available_size -lt $memtotal ]; then
                             echo "Warning: There is not space enough to save a vmcore."
-                            echo "         The size of $rlocation:$tdir should be much greater than $memtotal bytes."
+                            echo "         The size of $rlocation:$tdir should be much greater than $memtotal kilo bytes."
                         fi
                         #We do this to remove the temp directory from above
                         ssh -q $s_opts $rlocation rmdir $tdir
@@ -1649,7 +1649,7 @@ if [ -n "$KDUMP_CONFIG_FILE" ]; then
                     #check for available size is greater than $memtotal
                     if [ $available_size -lt $memtotal ]; then
                         echo "Warning: There is not space enough to save a vmcore."
-                        echo "         The size of $location should be much greater than $memtotal bytes."
+                        echo "         The size of $location should be much greater than $memtotal kilo bytes."
                     fi