summaryrefslogtreecommitdiff
path: root/fml/libexec
diff options
context:
space:
mode:
authorfukachan <fukachan>2001-02-01 08:43:16 +0000
committerfukachan <fukachan>2001-02-01 08:43:16 +0000
commit7641b09e78a7ead900cc10947577fe940722d79b (patch)
treedd9f1531dfc57c2de4f402f1bbf7007fcd35639a /fml/libexec
parenta1204fbc2298de08854fc69c3df1fef480e9996a (diff)
downloadfml8-7641b09e78a7ead900cc10947577fe940722d79b.tar.gz
fml8-7641b09e78a7ead900cc10947577fe940722d79b.tar.bz2
fml8-7641b09e78a7ead900cc10947577fe940722d79b.zip
change @cf to try to load in the following way:
1. /etc/fml/defaults/$fml_version/default_config.cf 2. /etc/fml/site_default_config.cf (required ?) 3. /etc/fml/domains/$DOMAIN/default_config.cf 4. /var/spool/ml/$ml_name/config.cf
Diffstat (limited to 'fml/libexec')
-rwxr-xr-xfml/libexec/loader8
1 files changed, 6 insertions, 2 deletions
diff --git a/fml/libexec/loader b/fml/libexec/loader
index d26d129c..923723bb 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.2 2001/01/29 03:23:41 fukachan Exp $
+# $Id: loader,v 1.3 2001/01/29 04:32:35 fukachan Exp $
# $FML$
#
@@ -56,7 +56,8 @@ sub Bootstrap
# pass *.cf files to libexec/{distribute,command}
# for example
# @cf = ( /etc/fml/defaults/$VERSION/default_config.cf
- # /etc/fml/domains/$DOMAIN/config.cf
+ # /etc/fml/site_default_config.cf (required ?)
+ # /etc/fml/domains/$DOMAIN/default_config.cf
# /var/spool/ml/elena/config.cf
# );
my @cf = ();
@@ -83,6 +84,9 @@ sub Bootstrap
);
my $libexec_dir = $main_cf->{ libexec_dir };
my $default_config = $my_default_config || $main_cf->{ default_config };
+
+ # XXX hmm, .. '/etc/fml/site_default_config.cf' is good ???
+ unshift(@cf, '/etc/fml/site_default_config.cf');
unshift(@cf, $default_config);
# 3. reset @INC