diff options
Diffstat (limited to 'runit')
| -rw-r--r-- | runit/Config.in | 22 | ||||
| -rw-r--r-- | runit/Kbuild | 5 | ||||
| -rw-r--r-- | runit/runit_lib.c | 23 | ||||
| -rw-r--r-- | runit/runit_lib.h | 12 |
4 files changed, 45 insertions, 17 deletions
diff --git a/runit/Config.in b/runit/Config.in index c849c07..8a7deea 100644 --- a/runit/Config.in +++ b/runit/Config.in @@ -5,6 +5,28 @@ menu "Runit Utilities" +config RUNSV + bool "runsv" + default n + help + runsv starts and monitors a service and optionally an appendant log + service. + +config RUNSVDIR + bool "runsvdir" + default n + help + runsvdir starts a runsv process for each subdirectory, or symlink to + a directory, in the services directory dir, up to a limit of 1000 + subdirectories, and restarts a runsv process if it terminates. + +config SV + bool "sv" + default n + help + sv reports the current status and controls the state of services + monitored by the runsv supervisor. + config SVLOGD bool "svlogd" default n diff --git a/runit/Kbuild b/runit/Kbuild index 7300356..ad1706c 100644 --- a/runit/Kbuild +++ b/runit/Kbuild @@ -5,5 +5,8 @@ # Licensed under the GPL v2, see the file LICENSE in this tarball. lib-y:= -lib-$(CONFIG_CHPST) += chpst.o +lib-$(CONFIG_RUNSV) += runsv.o runit_lib.o +lib-$(CONFIG_RUNSVDIR) += runsvdir.o runit_lib.o +lib-$(CONFIG_SV) += sv.o runit_lib.o lib-$(CONFIG_SVLOGD) += svlogd.o runit_lib.o +lib-$(CONFIG_CHPST) += chpst.o diff --git a/runit/runit_lib.c b/runit/runit_lib.c index 322bef8..c95d641 100644 --- a/runit/runit_lib.c +++ b/runit/runit_lib.c @@ -519,6 +519,7 @@ void taia_uint(struct taia *t,unsigned s) /*** stralloc_cat.c ***/ +#if 0 int stralloc_cat(stralloc *sato,const stralloc *safrom) { @@ -577,6 +578,7 @@ int stralloc_copys(stralloc *sa,const char *s) GEN_ALLOC_append(stralloc,char,s,len,a,i,n,x,30,stralloc_readyplus,stralloc_append) +#endif /* stralloc */ /*** iopause.c ***/ @@ -643,7 +645,7 @@ int ndelay_on(int fd) int open_append(const char *fn) { - return open(fn,O_WRONLY | O_NDELAY | O_APPEND | O_CREAT,0600); + return open(fn, O_WRONLY|O_NDELAY|O_APPEND|O_CREAT, 0600); } @@ -651,7 +653,7 @@ int open_append(const char *fn) int open_read(const char *fn) { - return open(fn,O_RDONLY | O_NDELAY); + return open(fn, O_RDONLY|O_NDELAY); } @@ -667,12 +669,12 @@ int open_trunc(const char *fn) int open_write(const char *fn) { - return open(fn,O_WRONLY | O_NDELAY); + return open(fn, O_WRONLY|O_NDELAY); } /*** openreadclose.c ***/ - +#if 0 int openreadclose(const char *fn,stralloc *sa,unsigned bufsize) { int fd; @@ -684,10 +686,11 @@ int openreadclose(const char *fn,stralloc *sa,unsigned bufsize) if (readclose(fd,sa,bufsize) == -1) return -1; return 1; } +#endif /*** pathexec_env.c ***/ - +#if 0 static stralloc plus; static stralloc tmp; @@ -748,10 +751,10 @@ void pathexec(char **argv) pathexec_run(*argv,argv,e); free(e); } - +#endif /*** pathexec_run.c ***/ - +#if 0 static stralloc tmp; void pathexec_run(const char *file,char *const *argv,char *const *envp) @@ -792,7 +795,7 @@ void pathexec_run(const char *file,char *const *argv,char *const *envp) path += 1; } } - +#endif /*** pmatch.c ***/ @@ -853,7 +856,7 @@ int prot_uid(int uid) /*** readclose.c ***/ - +#if 0 int readclose_append(int fd,stralloc *sa,unsigned bufsize) { int r; @@ -871,7 +874,7 @@ int readclose(int fd,stralloc *sa,unsigned bufsize) if (!stralloc_copys(sa,"")) { close(fd); return -1; } return readclose_append(fd,sa,bufsize); } - +#endif /*** scan_ulong.c ***/ diff --git a/runit/runit_lib.h b/runit/runit_lib.h index d306164..1f91191 100644 --- a/runit/runit_lib.h +++ b/runit/runit_lib.h @@ -233,7 +233,7 @@ int ta_append(ta *x,const type *i) \ /*** stralloc.h ***/ - +#if 0 GEN_ALLOC_typedef(stralloc,char,s,len,a) extern int stralloc_ready(stralloc *,unsigned); @@ -256,7 +256,7 @@ extern int stralloc_catlong0(stralloc *,long,unsigned); #define stralloc_catuint0(sa,i,n) (stralloc_catulong0((sa),(i),(n))) #define stralloc_catint0(sa,i,n) (stralloc_catlong0((sa),(i),(n))) #define stralloc_catint(sa,i) (stralloc_catlong0((sa),(i),0)) - +#endif /*** iopause.h ***/ @@ -290,9 +290,9 @@ extern int open_write(const char *); /*** openreadclose.h ***/ - +#if 0 extern int openreadclose(const char *,stralloc *,unsigned); - +#endif /*** pathexec.h ***/ @@ -313,10 +313,10 @@ extern int prot_uid(int); /*** readclose.h ***/ - +#if 0 extern int readclose_append(int,stralloc *,unsigned); extern int readclose(int,stralloc *,unsigned); - +#endif /*** scan.h ***/ |