mirrors
/
sanoid
mirror of https://github.com/jimsalterjrs/sanoid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #18 from jjlawren/check_zfs_recv 

Also check for 'zfs receive' alias
This commit is contained in:
Jim Salter 2015-12-31 12:47:48 -05:00
parent c039f2fff7 921ec1b3da
commit e297624135
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sanoid
View File

@ -1006,7 +1006,7 @@ sub iszfsbusy {
foreach my $process (@processes) {
# if ($args{'debug'}) { print "DEBUG: checking process $process...\n"; }
if ($process =~ /zfs *(send|receive).*$fs/) {
if ($process =~ /zfs *(send|receive|recv).*$fs/) {
# there's already a zfs send/receive process for our target filesystem - return true
# if ($args{'debug'}) { print "DEBUG: process $process matches target $fs!\n"; }
return 1;

2
syncoid
View File

@ -466,7 +466,7 @@ sub iszfsbusy {
foreach my $process (@processes) {
# if ($debug) { print "DEBUG: checking process $process...\n"; }
if ($process =~ /zfs receive.*$fs/) {
if ($process =~ /zfs *(receive|recv).*$fs/) {
# there's already a zfs receive process for our target filesystem - return true
if ($debug) { print "DEBUG: process $process matches target $fs!\n"; }
return 1;