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

Allow rc-depend to order as if runlevel was starting or stopping.

Browse Source
This commit is contained in:
Roy Marples 2008-02-20 10:52:57 +00:00
parent fabce3a51b
commit 2456a265ee
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,10 +34,12 @@
#include <getopt.h> #include <getopt.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h>
#include "builtins.h" #include "builtins.h"
#include "einfo.h" #include "einfo.h"
@ -49,7 +51,18 @@ extern const char *applet;
rc_depinfo_t *_rc_deptree_load (int *regen) { rc_depinfo_t *_rc_deptree_load (int *regen) {
if (rc_deptree_update_needed ()) { if (rc_deptree_update_needed ()) {
int fd;
int retval; int retval;
int serrno = errno;
int merrno;
/* Test if we have permission to update the deptree */
fd = open (RC_DEPTREE, O_WRONLY);
merrno = errno;
errno = serrno;
if (fd == -1 && merrno == EACCES)
return (rc_deptree_load ());
close (fd);
if (regen) if (regen)
*regen = 1; *regen = 1;
@ -63,8 +76,10 @@ rc_depinfo_t *_rc_deptree_load (int *regen) {
} }
#include "_usage.h" #include "_usage.h"
#define getoptstring "t:suT" getoptstring_COMMON #define getoptstring "aot:suT" getoptstring_COMMON
static const struct option longopts[] = { static const struct option longopts[] = {
{ "starting", 0, NULL, 'a'},
{ "stopping", 0, NULL, 'o'},
{ "type", 1, NULL, 't'}, { "type", 1, NULL, 't'},
{ "notrace", 0, NULL, 'T'}, { "notrace", 0, NULL, 'T'},
{ "strict", 0, NULL, 's'}, { "strict", 0, NULL, 's'},
@ -72,6 +87,8 @@ static const struct option longopts[] = {
longopts_COMMON longopts_COMMON
}; };
static const char * const longopts_help[] = { static const char * const longopts_help[] = {
"Order services as if runlevel is starting",
"Order services as if runlevel is stopping",
"Type(s) of dependency to list", "Type(s) of dependency to list",
"Don't trace service dependencies", "Don't trace service dependencies",
"Only use what is in the runlevels", "Only use what is in the runlevels",
@ -100,6 +117,12 @@ int rc_depend (int argc, char **argv)
longopts, (int *) 0)) != -1) longopts, (int *) 0)) != -1)
{ {
switch (opt) { switch (opt) {
case 'a':
options |= RC_DEP_START;
break;
case 'b':
options |= RC_DEP_STOP;
break;
case 's': case 's':
options |= RC_DEP_STRICT; options |= RC_DEP_STRICT;
break; break;