diff options
| -rw-r--r-- | fml/lib/FML/Config.pm | 7 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Configure.pm | 3 | ||||
| -rwxr-xr-x | fml/libexec/loader | 10 |
3 files changed, 11 insertions, 9 deletions
diff --git a/fml/lib/FML/Config.pm b/fml/lib/FML/Config.pm index 6a557ded..b05f75aa 100644 --- a/fml/lib/FML/Config.pm +++ b/fml/lib/FML/Config.pm @@ -31,11 +31,10 @@ sub new sub dump_variables { - my ($mode) = @_; + my ($self, $args) = @_; my ($k, $v); - my $len = 0; - - $mode ||= 'all'; + my $len = 0; + my $mode = $args->{ mode } || 'all'; for $k (keys %_fml_config) { $len = $len > length($k) ? $len : length($k);} diff --git a/fml/lib/FML/Process/Configure.pm b/fml/lib/FML/Process/Configure.pm index 973371cd..60a6486b 100644 --- a/fml/lib/FML/Process/Configure.pm +++ b/fml/lib/FML/Process/Configure.pm @@ -55,8 +55,9 @@ sub _show_conf { my ($curproc, $args) = @_; my $config = $curproc->{ config }; + my $mode = $args->{ options }->{ n } ? 'difference_only' : 'all'; - $config->dump_variables(); + $config->dump_variables({ mode => $mode }); } diff --git a/fml/libexec/loader b/fml/libexec/loader index dc8adecb..61b8aacb 100755 --- a/fml/libexec/loader +++ b/fml/libexec/loader @@ -4,7 +4,7 @@ # Copyright (C) 2000-2001 Ken'ichi Fukamachi # All rights reserved. # -# $Id: loader,v 1.6 2001/02/05 10:18:20 fukachan Exp $ +# $Id: loader,v 1.7 2001/02/06 09:44:41 fukachan Exp $ # $FML$ # @@ -143,13 +143,15 @@ sub prepare_myname_options my ($myname) = @_; if ($myname eq 'fml.pl' || - $myname eq 'loader' || - $myname eq 'fmlconf') { + $myname eq 'loader' ) { return qw(ctladdr! debug! params=s -c=s); } elsif ($myname eq 'fmlticket') { return qw(debug! params=s -c=s -A=s -R=s); - } + } + elsif ($myname eq 'fmlconf') { + return qw(ctladdr! debug! params=s -c=s n!); + } else { croak "$myname is unknown yet\n"; } |