utils/mkd_save mkd_save,1.7,1.8

[kaku <fk...@us...>]

Update of /cvsroot/mkdump/utils/mkd_save
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27843

Modified Files:
	mkd_save 
Log Message:
Changed to use it if there is mkd_conv.


Index: mkd_save
===================================================================
RCS file: /cvsroot/mkdump/utils/mkd_save/mkd_save,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mkd_save	9 Feb 2006 03:54:00 -0000	1.7
--- mkd_save	3 Mar 2006 00:17:41 -0000	1.8
***************
*** 27,33 ****
--- 27,39 ----
  CONFIG_FILE=/etc/mkdump/mkdump
  MEMDUMP_FILE=mkdump
+ LKCDDUMP_FILE=lkcd_dump
  SWAPDUMP_FILE=mkswpdump
  MKDUMP_LIMIT_DEFAULT=5
  BLOCK_SIZE=1M
+ MKD_CONV=""
+ which mkd_conv 1> /dev/null 2>&1
+ if [ $? -eq 0 ]; then
+ 	MKD_CONV=mkd_conv
+ fi
  
  MACHINE=`uname -m`
***************
*** 87,91 ****
  # check dump header 
  #---------------------------------------------------------------
! CheckDumpHeader `mkd_chk -n $MKDUMP_DEV`
  if [ $? -ne 0 ]; then
  	echo "skip dump save."
--- 93,101 ----
  # check dump header 
  #---------------------------------------------------------------
! if [ -z "$MKD_CONV" ]; then
! 	CheckDumpHeader `mkd_chk -n $MKDUMP_DEV`
! else
! 	CheckDumpHeader `$MKD_CONV -I -n $MKDUMP_DEV`
! fi
  if [ $? -ne 0 ]; then
  	echo "skip dump save."
***************
*** 110,117 ****
  #---------------------------------------------------------------
  echo "save mkdump.($MKDUMP_DEV)"
! dd if=$MKDUMP_DEV of=$SAVE_DIR/$MEMDUMP_FILE bs=$BLOCK_SIZE
  [ $? -ne 0 ] && exit 1
  
  #---------------------------------------------------------------
  # save swap dump. 
  #---------------------------------------------------------------
--- 120,142 ----
  #---------------------------------------------------------------
  echo "save mkdump.($MKDUMP_DEV)"
! if [ -z "$MKD_CONV" ]; then
! 	dd if=$MKDUMP_DEV of=$SAVE_DIR/$MEMDUMP_FILE bs=$BLOCK_SIZE
! else
! 	$MKD_CONV $MKDUMP_DEV $SAVE_DIR/$LKCDDUMP_FILE
! fi
  [ $? -ne 0 ] && exit 1
  
  #---------------------------------------------------------------
+ # pre-format dump device. 
+ #---------------------------------------------------------------
+ if [ "x${MKDUMP_PREFORMAT}" = "xy" -o "x${MKDUMP_PREFORMAT}" = "xY" ]; then
+ 	if [ -n "$MKD_CONV" ]; then
+ 		echo "pre-format dump device"
+ 		$MKD_CONV -P $MKDUMP_DEV
+ 		[ $? -ne 0 ] && exit 1
+ 	fi
+ fi
+ 
+ #---------------------------------------------------------------
  # save swap dump. 
  #---------------------------------------------------------------
***************
*** 120,124 ****
  	for f in $MKDUMP_SWAPDEV; do
  		echo "save swap device.($f)"
! 		dd if=$f of=${SAVE_DIR}/${SWAPDUMP_FILE}${i} bs=$BLOCK_SIZE
  		[ $? -ne 0 ] && exit 1
  		let i=$i+1
--- 145,153 ----
  	for f in $MKDUMP_SWAPDEV; do
  		echo "save swap device.($f)"
! 		if [ -z "$MKD_CONV" ]; then
! 			dd if=$f of=${SAVE_DIR}/${SWAPDUMP_FILE}${i} bs=$BLOCK_SIZE
! 		else
! 			$MKD_CONV -d 0 -n $f ${SAVE_DIR}/${SWAPDUMP_FILE}${i}
! 		fi
  		[ $? -ne 0 ] && exit 1
  		let i=$i+1
***************
*** 129,133 ****
  # set unique. 
  #---------------------------------------------------------------
! mkd_chk -n -w0 $MKDUMP_DEV > /dev/null
  [ $? -ne 0 ] && exit 1
  
--- 158,166 ----
  # set unique. 
  #---------------------------------------------------------------
! if [ -z "$MKD_CONV" ]; then
! 	mkd_chk -n -w0 $MKDUMP_DEV > /dev/null
! else
! 	$MKD_CONV -n -w0 $MKDUMP_DEV > /dev/null
! fi
  [ $? -ne 0 ] && exit 1