wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-30 12:50:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'finit-sm' of https://github.com/westermo/finit into westermo-finit-sm

Browse Source 
Hand merged conflicts in the following files:
	Makefile
	finit.h
	service.c

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson committed 2016-06-04 19:48:08 +02:00
2 parents d48da81026 ad2bafbfe8
commit cc15d3f77b
9 files changed
+307 -152
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Makefile.am
+1 -1
View File
@@ -1,7 +1,7 @@
ACLOCAL_AMFLAGS = -I m4
sbin_PROGRAMS = finit initctl reboot
finit_SOURCES = finit.c api.c client.c conf.c exec.c helpers.c pid.c \
sig.c svc.c service.c plugin.c tty.c cond.c cond-w.c
sig.c svc.c service.c plugin.c tty.c cond.c cond-w.c sm.c
pkginclude_HEADERS = cond.h finit.h helpers.h inetd.h plugin.h queue.h svc.h
if INETD
finit_SOURCES += inetd.c