projects
/
zfs-ubuntu
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://gerrit.cobaldwins.net:29418/zfs/zfs-snapshot
[zfs-ubuntu/.git]
/
zfs-scrub
diff --git
a/zfs-scrub
b/zfs-scrub
index 840987693424e931cdb3472046d57ac189e2cca5..fbeadb7156aa814f2b01bbfae97dc404bcecd093 100755
(executable)
--- a/
zfs-scrub
+++ b/
zfs-scrub
@@
-90,7
+90,7
@@
do
# Export the local pool if told to do so
if [[ $import_export_backup_pool == 1 ]] && [[ "$i" =~ "$backup_pool" ]]; then
# Export the local pool if told to do so
if [[ $import_export_backup_pool == 1 ]] && [[ "$i" =~ "$backup_pool" ]]; then
- # Don't export if there is a currently running zfs-replicate operation
+ # Don't export
the pool
if there is a currently running zfs-replicate operation
ps -ef | grep -q "zfs-replicate" | grep -v grep
if [ $? != 0 ]; then
zpool export $i
ps -ef | grep -q "zfs-replicate" | grep -v grep
if [ $? != 0 ]; then
zpool export $i