rpms/kexec-tools/F-13 kexec-tools.spec, 1.158, 1.159 mkdumprd, 1.30, 1.31

[Neil Horman]

Author: nhorman

Update of /cvs/pkgs/rpms/kexec-tools/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28131

Modified Files:
	kexec-tools.spec mkdumprd 
Log Message:
Resoves: bz 572569


Index: kexec-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kexec-tools/F-13/kexec-tools.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- kexec-tools.spec	17 Feb 2010 18:22:39 -0000	1.158
+++ kexec-tools.spec	11 Mar 2010 16:18:34 -0000	1.159
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 32%{?dist}
+Release: 33%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -268,6 +268,9 @@ done
 
 
 %changelog
+* Thu Mar 11 2010 Neil Horman <nhorman at redhat.com> - 2.0.0-33
+- Removed nash references from mkdumprd (bz 572569)
+
 * Wed Feb 17 2010 Neil Horman <nhorman at redhat.com> - 2.0.0-32
 - Fixing spec file
 


Index: mkdumprd
===================================================================
RCS file: /cvs/pkgs/rpms/kexec-tools/F-13/mkdumprd,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- mkdumprd	17 Feb 2010 18:17:31 -0000	1.30
+++ mkdumprd	11 Mar 2010 16:18:34 -0000	1.31
@@ -135,16 +135,15 @@ moduledep() {
 }
 
 findone() {
-    echo nash-find "$@" | /sbin/nash --force --quiet \
-	| /bin/awk '{ print $1; exit; }'
+    find "$@" | /bin/awk '{print $1; exit}'
 }
 
 findall() {
-    echo nash-find "$@" | /sbin/nash --force --quiet
+    find "$@"
 }
 
 dm_get_uuid() {
-    echo dm get_uuid "$1" | /sbin/nash --force --quiet
+    dmsetup info "$1" | awk '/^.*UUID.*/ {print $2}'
 }
 
 findmodule() {
@@ -207,7 +206,7 @@ findmodule() {
             do
                 if [ -d $modDir ]
                 then
-                    fmPath=$(findone $modDir -name $modName.$modExt)
+                    fmPath=$(findone $modDir -name $modName.ko)
                     if [ -f "$fmPath" ]
                     then
                         break 2
@@ -260,12 +259,9 @@ inst() {
 }
 
 readlink() {
-    echo nash-readlink "$1" | /sbin/nash --force --quiet
+    readlink "$1"
 }
 
-access() {
-    echo nash-access -w $t | /sbin/nash --force --quiet
-}
 
 findstoragedriverinsys () {
     while [ ! -L device ]; do
@@ -645,7 +641,6 @@ modulefile=/etc/modprobe.conf
 TMPDIR=""
 for t in /tmp /var/tmp /root ${PWD}; do
     if [ ! -d $t ]; then continue; fi
-    if ! access -w $t ; then continue; fi
 
     fs=$(df -T $t 2>/dev/null | awk '{line=$1;} END {printf $2;}')
     if [ "$fs" != "tmpfs" ]; then