1.4.2 - remove -r flag from zfs destroy command for pruned snapshots
This commit is contained in:
parent
9c3bf32fa5
commit
a334fc9e15
|
@ -1,3 +1,5 @@
|
||||||
|
1.4.2 removed -r flag for zfs destroy of pruned snapshots in sanoid, which unintentionally caused same-name child snapshots to be deleted - thank you Lenz Weber!
|
||||||
|
|
||||||
1.4.1 updated check_zpool() in sanoid to parse zpool list properly both pre- and post- ZoL v0.6.4
|
1.4.1 updated check_zpool() in sanoid to parse zpool list properly both pre- and post- ZoL v0.6.4
|
||||||
|
|
||||||
1.4.0 added findoid tool - find and list all versions of a given file in all available ZFS snapshots. use: findoid /path/to/file
|
1.4.0 added findoid tool - find and list all versions of a given file in all available ZFS snapshots. use: findoid /path/to/file
|
||||||
|
|
2
findoid
2
findoid
|
@ -11,7 +11,7 @@ use warnings;
|
||||||
my $zfs = '/sbin/zfs';
|
my $zfs = '/sbin/zfs';
|
||||||
my %args = getargs(@ARGV);
|
my %args = getargs(@ARGV);
|
||||||
|
|
||||||
my $progversion = '1.4.1';
|
my $progversion = '1.4.2';
|
||||||
|
|
||||||
if ($args{'version'}) { print "$progversion\n"; exit 0; }
|
if ($args{'version'}) { print "$progversion\n"; exit 0; }
|
||||||
|
|
||||||
|
|
4
sanoid
4
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
|
# 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.
|
# project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE.
|
||||||
|
|
||||||
my $version = '1.4.1';
|
my $version = '1.4.2';
|
||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
use Config::IniFiles; # read samba-style conf file
|
use Config::IniFiles; # read samba-style conf file
|
||||||
|
@ -223,7 +223,7 @@ sub prune_snapshots {
|
||||||
if (iszfsbusy($path)) {
|
if (iszfsbusy($path)) {
|
||||||
print "INFO: deferring pruning of $snap - $path is currently in zfs send or receive.\n";
|
print "INFO: deferring pruning of $snap - $path is currently in zfs send or receive.\n";
|
||||||
} else {
|
} else {
|
||||||
if (! $args{'readonly'}) { system($zfs, "destroy","-Rr",$snap) == 0 or die "could not remove $snap : $?"; }
|
if (! $args{'readonly'}) { system($zfs, "destroy","-R",$snap) == 0 or die "could not remove $snap : $?"; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
removelock('sanoid_pruning');
|
removelock('sanoid_pruning');
|
||||||
|
|
2
syncoid
2
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
|
# 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.
|
# project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE.
|
||||||
|
|
||||||
my $version = '1.4.1';
|
my $version = '1.4.2';
|
||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
use Data::Dumper;
|
use Data::Dumper;
|
||||||
|
|
Loading…
Reference in New Issue