rpms/kexec-tools/devel kexec-tools.spec, 1.95, 1.96 mkdumprd, 1.16, 1.17

[Neil Horman (nhorman)]

Author: nhorman

Update of /cvs/extras/rpms/kexec-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2833

Modified Files:
	kexec-tools.spec mkdumprd 
Log Message:
Resolves: bz 252170


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/kexec-tools.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- kexec-tools.spec	21 Aug 2007 15:21:40 -0000	1.95
+++ kexec-tools.spec	22 Aug 2007 15:14:11 -0000	1.96
@@ -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 @@
 %doc kexec-kdump-howto.txt
 
 %changelog
+* Wed Aug 22 2007 Neil Horman <nhorman at redhat.com> - 1.101-80
+- Fix ability to determine space on nfs shares (bz 252170)
+
 * Tue Aug 21 2007 Neil Horman <nhorman at redhat.com> - 1.101-79
 - Update kdump.init to always create sparse files (bz 253714)
 


Index: mkdumprd
===================================================================
RCS file: /cvs/extras/rpms/kexec-tools/devel/mkdumprd,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mkdumprd	1 Aug 2007 17:44:53 -0000	1.16
+++ mkdumprd	22 Aug 2007 15:14:11 -0000	1.17
@@ -1475,7 +1475,7 @@
                     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 @@
                                    "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 @@
                         #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 @@
                         #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 @@
                     #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