cyteen
/
sanoid
mirror of https://github.com/jimsalterjrs/sanoid
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed uninitialzed variable warning and clarified recursive value

This commit is contained in:
Christoph Klaffl 2019-01-07 09:48:04 +01:00
parent 271ede7116
commit 0fc16b4903
No known key found for this signature in database
GPG Key ID: FC1C525C2A47CC28
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sanoid
View File

@ -765,6 +765,8 @@ sub init {
# we'll use these later to normalize potentially true and false values on any toggle keys # we'll use these later to normalize potentially true and false values on any toggle keys
my @toggles = ('autosnap','autoprune','monitor_dont_warn','monitor_dont_crit','monitor','recursive','process_children_only','skip_children','no_inconsistent_snapshot','force_post_snapshot_script'); my @toggles = ('autosnap','autoprune','monitor_dont_warn','monitor_dont_crit','monitor','recursive','process_children_only','skip_children','no_inconsistent_snapshot','force_post_snapshot_script');
# recursive is defined as toggle but can also have the special value "zfs", it is kept to be backward compatible
my @istrue=(1,"true","True","TRUE","yes","Yes","YES","on","On","ON"); my @istrue=(1,"true","True","TRUE","yes","Yes","YES","on","On","ON");
my @isfalse=(0,"false","False","FALSE","no","No","NO","off","Off","OFF"); my @isfalse=(0,"false","False","FALSE","no","No","NO","off","Off","OFF");
@ -861,9 +863,10 @@ sub init {
# how 'bout some recursion? =) # how 'bout some recursion? =)
my $recursive = $ini{$section}{'recursive'} && grep( /^$ini{$section}{'recursive'}$/, @istrue ); my $recursive = $ini{$section}{'recursive'} && grep( /^$ini{$section}{'recursive'}$/, @istrue );
my $zfsRecursive = $ini{$section}{'recursive'} && $ini{$section}{'recursive'} =~ /zfs/i;
my $skipChildren = $ini{$section}{'skip_children'} && grep( /^$ini{$section}{'skip_children'}$/, @istrue ); my $skipChildren = $ini{$section}{'skip_children'} && grep( /^$ini{$section}{'skip_children'}$/, @istrue );
my @datasets; my @datasets;
if ($ini{$section}{'recursive'} =~ /zfs/i) { if ($zfsRecursive) {
$config{$section}{'zfs_recursion'} = 1; $config{$section}{'zfs_recursion'} = 1;
} elsif ($recursive || $skipChildren) { } elsif ($recursive || $skipChildren) {
@datasets = getchilddatasets($config{$section}{'path'}); @datasets = getchilddatasets($config{$section}{'path'});