emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add new option -F to rc-depend tool, so that we can debug user deptree files easily.

Browse Source
This commit is contained in:
Robin H. Johnson 2011-01-17 06:48:26 +00:00
parent 0e90ae266a
commit b00ad439a6
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/rc/rc-depend.c
View File

@ -106,7 +106,7 @@ _rc_deptree_load(int force, int *regen) {
} }
#include "_usage.h" #include "_usage.h"
#define getoptstring "aot:suT" getoptstring_COMMON #define getoptstring "aot:suTF:" getoptstring_COMMON
static const struct option longopts[] = { static const struct option longopts[] = {
{ "starting", 0, NULL, 'a'}, { "starting", 0, NULL, 'a'},
{ "stopping", 0, NULL, 'o'}, { "stopping", 0, NULL, 'o'},
@ -114,6 +114,7 @@ static const struct option longopts[] = {
{ "notrace", 0, NULL, 'T'}, { "notrace", 0, NULL, 'T'},
{ "strict", 0, NULL, 's'}, { "strict", 0, NULL, 's'},
{ "update", 0, NULL, 'u'}, { "update", 0, NULL, 'u'},
{ "deptree-file", 1, NULL, 'F'},
longopts_COMMON longopts_COMMON
}; };
static const char * const longopts_help[] = { static const char * const longopts_help[] = {
@ -123,6 +124,7 @@ static const char * const longopts_help[] = {
"Don't trace service dependencies", "Don't trace service dependencies",
"Only use what is in the runlevels", "Only use what is in the runlevels",
"Force an update of the dependency tree", "Force an update of the dependency tree",
"File to load cached deptree from",
longopts_help_COMMON longopts_help_COMMON
}; };
#include "_usage.c" #include "_usage.c"
@ -141,6 +143,7 @@ rc_depend(int argc, char **argv)
char *runlevel = xstrdup(getenv("RC_RUNLEVEL")); char *runlevel = xstrdup(getenv("RC_RUNLEVEL"));
int opt; int opt;
char *token; char *token;
char *deptree_file = NULL;
types = rc_stringlist_new(); types = rc_stringlist_new();
while ((opt = getopt_long(argc, argv, getoptstring, while ((opt = getopt_long(argc, argv, getoptstring,
@ -166,13 +169,21 @@ rc_depend(int argc, char **argv)
case 'T': case 'T':
options &= RC_DEP_TRACE; options &= RC_DEP_TRACE;
break; break;
case 'F':
deptree_file = strdup(optarg);
break;
case_RC_COMMON_GETOPT case_RC_COMMON_GETOPT
} }
} }
if (!(deptree = _rc_deptree_load(update, NULL))) if(deptree_file) {
eerrorx("failed to load deptree"); if(!(deptree = rc_deptree_load_file(deptree_file)))
eerrorx("failed to load deptree");
} else {
if (!(deptree = _rc_deptree_load(update, NULL)))
eerrorx("failed to load deptree");
}
if (!runlevel) if (!runlevel)
runlevel = rc_runlevel_get(); runlevel = rc_runlevel_get();