Fix mountpoint after full fs transfer if needed

[zfs-ubuntu/.git] / zfs-replicate-all

diff --git a/zfs-replicate-all b/zfs-replicate-all
index 01f1becb7a2930c2c9938084951320ba5f4aa1ba..54f96eb97b042072217d00dea8573b45f4171581 100755 (executable)
--- a/zfs-replicate-all
+++ b/zfs-replicate-all
@@ -14,12 +14,12 @@ logfile="$logdir/zfs-replicate.log"
 mylogfile="$logdir/zfs-replicate-all.log"
 date=`date`
 starttime=`date +%s`
-tmpfile=`tempfile`
+tmpfile=`mktemp`
 
 # Make sure we aren't already running
 SCRIPT_NAME=${0##*/}
-PROCESS_LIST=`tempfile`
-ps -ef | grep -e "$SCRIPT_NAME" | grep -v grep | grep -v $$ | grep -v $PPID >> $PROCESS_LIST
+PROCESS_LIST=`mktemp`
+ps -ef | grep -e "$SCRIPT_NAME" | grep -v grep | grep -v tail | grep -v less | grep -v $$ | grep -v $PPID >> $PROCESS_LIST
 if [[ $? == 0 ]]; then
    echo "$date Another $SCRIPT_NAME process is already running" >> $mylogfile
    cat $PROCESS_LIST >> $mylogfile
@@ -101,7 +101,7 @@ for backup_pool in $backup_pools; do
 zpool list -H $backup_pool > $tmpfile 2>&1
 if [ $? != 0 ]; then
   if [[ $import_export_backup_pool == 1 ]]; then
-    zpool import $backup_pool >> $tmpfile 2>&1
+    zpool import -f $backup_pool >> $tmpfile 2>&1
     if [ $? != 0 ]; then
       msgs=`cat $tmpfile`
       fatal_and_exit "-E- unable to import the backup pool '$backup_pool' on $hostname: $msgs" "$mailto"