diff --git a/CHANGELIST b/CHANGELIST index 17ff61b..c32528f 100644 --- a/CHANGELIST +++ b/CHANGELIST @@ -1,3 +1,7 @@ +1.4.6a due to bug in ZFS on Linux which frequently causes errors to return from `zfs set readonly`, + changed ==0 or die in setzfsvalue() to ==0 or [complain] - it's not worth causing replication + to fail while this ZFS on Linux bug exists. + 1.4.6 added a mollyguard to syncoid to help newbies who try to zfs create a new target dataset before doing an initial replication, instead of letting the replication itself create the target. diff --git a/findoid b/findoid index b19dfba..b00b81a 100755 --- a/findoid +++ b/findoid @@ -11,7 +11,7 @@ use warnings; my $zfs = '/sbin/zfs'; my %args = getargs(@ARGV); -my $progversion = '1.4.6'; +my $progversion = '1.4.6a'; if ($args{'version'}) { print "$progversion\n"; exit 0; } diff --git a/sanoid b/sanoid index d44b576..8c3e013 100755 --- a/sanoid +++ b/sanoid @@ -4,7 +4,7 @@ # from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17. A copy should also be available in this # project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE. -my $version = '1.4.6'; +my $version = '1.4.6a'; use strict; use Config::IniFiles; # read samba-style conf file diff --git a/syncoid b/syncoid index a397c0b..c3892b4 100755 --- a/syncoid +++ b/syncoid @@ -4,7 +4,7 @@ # from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17. A copy should also be available in this # project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE. -my $version = '1.4.6'; +my $version = '1.4.6a'; use strict; use Data::Dumper; @@ -496,7 +496,7 @@ sub setzfsvalue { if ($isroot) { $mysudocmd = ''; } else { $mysudocmd = $sudocmd; } if ($debug) { print "$rhost $mysudocmd $zfscmd set $property=$value $fs\n"; } system("$rhost $mysudocmd $zfscmd set $property=$value $fs") == 0 - or die "CRITICAL ERROR: $rhost $mysudocmd $zfscmd set $property=$value $fs died: $?"; + or print "WARNING: $rhost $mysudocmd $zfscmd set $property=$value $fs died: $?, proceeding anyway.\n"; return; }