rpms/kexec-tools/devel mkdumprd,1.13,1.14

[fedora-cvs-commits at redhat.com]

Author: nhorman

Update of /cvs/dist/rpms/kexec-tools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1467

Modified Files:
	mkdumprd 
Log Message:
Resolves: bz 223743


Index: mkdumprd
===================================================================
RCS file: /cvs/dist/rpms/kexec-tools/devel/mkdumprd,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mkdumprd	15 Mar 2007 17:36:03 -0000	1.13
+++ mkdumprd	25 May 2007 17:50:07 -0000	1.14
@@ -924,19 +924,11 @@
 fi
 
 if [ -n "$CORE_COLLECTOR" ]; then
-    if [ "$USING_METHOD" == "ssh" ] || [ "$USING_METHOD" == "raw" ]; then
-        echo "You may only use alternate core collectors with the NFS and Local Filesystem targets"
-        rm -rf $MNTIMAGE
-        rm -rf $IMAGE
-        exit 1
-    fi 
-
     if [ -z "$USING_METHOD" ]
     then
         echo "Warning!  Lack of dump target specification means core_collector option is ignored!"
         CORE_COLLECTOR=""
     fi
-
 fi
 
 
@@ -1479,7 +1471,13 @@
 
                     #setup raw case
                     emit "echo Saving to partition $location"
-                    emit "dd if=/proc/vmcore of=$location"
+                    if [ -z "$CORE_COLLECTOR" ]
+                    then
+                        emit "dd if=/proc/vmcore of=$location"
+                    else
+                            CORE_COLLECTOR=`echo $CORE_COLLECTOR | sed -e's/\(^makedumpfile\)\(.*$\)/\1 -F \2/'`
+                            emit "$CORE_COLLECTOR /proc/vmcore | dd of=$location"
+                    fi
                     emit "if [ \$? == 0 ]"
                     emit "then"
                     emit "  reboot -f"
@@ -1584,6 +1582,11 @@
                     else
                         #SSH path
                         #rebuild $location replacing machine name with ip address
+                        if [ -n "$CORE_COLLECTOR" ]
+                        then
+                            CORE_COLLECTOR=`echo $CORE_COLLECTOR | sed -e's/\(^makedumpfile\)\(.*$\)/\1 -F \2/'`
+                        fi
+
                         bin="$bin /usr/bin/ssh /usr/bin/scp"
                         rlocation=`echo $location|sed 's/@.*/@'"$rhost"'/'`
                         #test ssh path and directory creation
@@ -1616,10 +1619,20 @@
                         fi
                         emit "dd if=/dev/mem of=/dev/urandom count=1 bs=512 skip=100" 
                         emit "ssh -q -o BatchMode=yes -o StrictHostKeyChecking=no $rlocation mkdir $SAVE_PATH/$lhost-\$DATE"
-                        emit "scp -q -o BatchMode=yes -o StrictHostKeyChecking=no /proc/vmcore $rlocation:$SAVE_PATH/$lhost-\$DATE/vmcore-incomplete"
+                        if [ -z "$CORE_COLLECTOR" ]
+                        then
+                            emit "scp -q -o BatchMode=yes -o StrictHostKeyChecking=no /proc/vmcore $rlocation:$SAVE_PATH/$lhost-\$DATE/vmcore-incomplete"
+                        else
+                            emit "$CORE_COLLECTOR /proc/vmcore | ssh -o BatchMode=yes -o StrictHostKeyChecking=no $rlocation \"cat > $SAVE_PATH/$lhost-\$DATE/vmcore-incomplete\""
+                        fi
                         emit "if [ \$? == 0 ]"
                         emit "then"
-                        emit "  ssh -q -o BatchMode=yes -o StrictHostKeyChecking=no $rlocation mv $SAVE_PATH/$lhost-\$DATE/vmcore-incomplete $SAVE_PATH/$lhost-\$DATE/vmcore"
+                        if [ -z "$CORE_COLLECTOR" ]
+                        then
+                            emit "  ssh -q -o BatchMode=yes -o StrictHostKeyChecking=no $rlocation mv $SAVE_PATH/$lhost-\$DATE/vmcore-incomplete $SAVE_PATH/$lhost-\$DATE/vmcore"
+                        else
+                            emit "  ssh -q -o BatchMode=yes -o StrictHostKeyChecking=no $rlocation mv $SAVE_PATH/$lhost-\$DATE/vmcore-incomplete $SAVE_PATH/$lhost-\$DATE/vmcore.flat"
+                        fi
                         emit "  reboot -f"
                         emit "fi"
                     fi