From 3ca3f66500dde2e9cba9ca2b3506342d74ebb83b Mon Sep 17 00:00:00 2001 From: Jim Salter Date: Thu, 31 Dec 2015 14:50:54 -0500 Subject: [PATCH] added --configdir=/path/to/configs CLI option --- sanoid | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sanoid b/sanoid index 8ea102e..891317d 100755 --- a/sanoid +++ b/sanoid @@ -12,15 +12,16 @@ use File::Path; # for rmtree command in use_prune use Data::Dumper; # debugging - print contents of hash use Time::Local; # to parse dates in reverse +# parse CLI arguments +my %args = getargs(@ARGV); + my $pscmd = '/bin/ps'; my $zfs = '/sbin/zfs'; -my $conf_file = '/etc/sanoid/sanoid.conf'; -my $default_conf_file = '/etc/sanoid/sanoid.defaults.conf'; - -# parse CLI arguments -my %args = getargs(@ARGV); +if ($args{'configdir'} eq '') { $args{'configdir'} = '/etc/sanoid'; } +my $conf_file = "$args{'configdir'}/sanoid.conf"; +my $default_conf_file = "$args{'configdir'}/sanoid.defaults.conf"; # parse config file my %config = init($conf_file,$default_conf_file); @@ -1030,7 +1031,7 @@ sub getargs { my %validargs; my %novalueargs; - push my @validargs, 'verbose','debug','version','monitor-health','monitor-snapshots','force-update','cron','take-snapshots','prune-snapshots','readonly'; + push my @validargs, 'verbose','debug','version','monitor-health','monitor-snapshots','force-update','cron','take-snapshots','prune-snapshots','readonly','configdir'; push my @novalueargs, 'verbose','debug','version','monitor-health','monitor-snapshots','force-update','cron','take-snapshots','prune-snapshots','readonly'; foreach my $item (@validargs) { $validargs{$item}=1; } foreach my $item (@novalueargs) { $novalueargs{$item}=1; }