Add support for including .conf files.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson committed 2014-04-19 22:56:19 +02:00
1 parent be3257f805
commit 62287f8fcc
3 files changed
+161 -130

No files matched your search

+6 -2
View File
@@ -160,6 +160,8 @@ static void banner(void)
int main(int argc, char* argv[])
{
int result;
if (getpid() != 1)
return client(argc, argv);
@@ -200,14 +202,16 @@ int main(int argc, char* argv[])
/*
* Parse configuration file
*/
parse_finit_conf(FINIT_CONF);
result = parse_finit_conf(FINIT_CONF);
print_desc("Loading " FINIT_CONF, NULL);
print_result(result);
/*
* Load plugins. Must run after finit.conf has registered
* all services, or service plugins won't have anything to
* hook on to.
*/
print_desc("", "Loading Finit plugins");
print_desc("Loading Finit plugins", NULL);
print_result(plugin_load_all(PLUGIN_PATH));
/*