plumber: add -f (foreground) option (#288)
In MacOS, services run by launchd must run in the foreground, since launchd manages forking and other resources.
This commit is contained in:
parent
1309450668
commit
b0aecb4ba5
4 changed files with 19 additions and 5 deletions
|
|
@ -186,7 +186,7 @@ getclock(void)
|
|||
}
|
||||
|
||||
void
|
||||
startfsys(void)
|
||||
startfsys(int foreground)
|
||||
{
|
||||
int p[2];
|
||||
|
||||
|
|
@ -199,7 +199,10 @@ startfsys(void)
|
|||
if(post9pservice(p[1], "plumb", nil) < 0)
|
||||
sysfatal("post9pservice plumb: %r");
|
||||
close(p[1]);
|
||||
proccreate(fsysproc, nil, Stack);
|
||||
if(foreground)
|
||||
fsysproc(nil);
|
||||
else
|
||||
proccreate(fsysproc, nil, Stack);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
#include "plumber.h"
|
||||
|
||||
int debug;
|
||||
int foreground=0;
|
||||
char *plumbfile;
|
||||
char *user;
|
||||
char *home;
|
||||
|
|
@ -37,6 +38,9 @@ threadmain(int argc, char *argv[])
|
|||
case 'd':
|
||||
debug = 1;
|
||||
break;
|
||||
case 'f':
|
||||
foreground = 1;
|
||||
break;
|
||||
case 'p':
|
||||
plumbfile = ARGF();
|
||||
break;
|
||||
|
|
@ -69,7 +73,7 @@ threadmain(int argc, char *argv[])
|
|||
*/
|
||||
printerrors = 0;
|
||||
makeports(rules);
|
||||
startfsys();
|
||||
startfsys(foreground);
|
||||
threadexits(nil);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ void* emalloc(long);
|
|||
void* erealloc(void*, long);
|
||||
char* estrdup(char*);
|
||||
Ruleset** readrules(char*, int);
|
||||
void startfsys(void);
|
||||
void startfsys(int);
|
||||
Exec* matchruleset(Plumbmsg*, Ruleset*);
|
||||
void freeexec(Exec*);
|
||||
char* startup(Ruleset*, Exec*);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue