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

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

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>

finit.h

@@ -33,8 +33,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <lite/lite.h>
 
-#include "lite/lite.h"
+#include "sm.h"
 
 #define CMD_SIZE                256
 #define LINE_SIZE               1024
@@ -79,6 +80,7 @@ extern char  *username;
 extern char  *runparts;
 extern char  *console;
 extern char  *__progname;
+extern sm_t  sm;
 
 #endif /* FINIT_H_ */