Add -f to zpool import commands

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

diff --git a/zfs-replicate-all b/zfs-replicate-all
index 01f1becb7a2930c2c9938084951320ba5f4aa1ba..5dde8b2eccf2c93bad96e45ce176c4d896ce9512 100755 (executable)
--- a/zfs-replicate-all
+++ b/zfs-replicate-all
@@ -19,7 +19,7 @@ tmpfile=`tempfile`
 # 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
+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"