File tree Expand file tree Collapse file tree 5 files changed +25
-49
lines changed
Expand file tree Collapse file tree 5 files changed +25
-49
lines changed Original file line number Diff line number Diff line change 3838#include "finit.h"
3939#include "helpers.h"
4040#include "plugin.h"
41- #include "tmpfiles.h"
4241#include "util.h"
4342#include "utmp-api.h"
4443
@@ -163,7 +162,7 @@ static void setup(void *arg)
163162 kernel_links ();
164163
165164 /* Create all system tmpfiles.d(5) */
166- tmpfilesd ( );
165+ execl ( _PATH_TMPFILES , _PATH_TMPFILES , NULL );
167166
168167 /* Set BOOT_TIME UTMP entry */
169168 utmp_set_boot ();
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ AM_LDFLAGS = -export-dynamic
88endif
99
1010sbin_PROGRAMS = finit initctl
11- pkglibexec_PROGRAMS = getty logit runparts
11+ pkglibexec_PROGRAMS = getty logit runparts tmpfiles
1212if SULOGIN
1313pkglibexec_PROGRAMS += sulogin
1414endif
@@ -43,6 +43,11 @@ sulogin_SOURCES = sulogin.c
4343sulogin_CFLAGS = -W -Wall -Wextra -std=gnu99
4444sulogin_LDADD = -lcrypt
4545
46+ tmpfiles_SOURCES = tmpfiles.c
47+ tmpfiles_CFLAGS = -W -Wall -Wextra -std=gnu99
48+ tmpfiles_CFLAGS += $(lite_CFLAGS )
49+ tmpfiles_LDADD = $(lite_LIBS )
50+
4651logit_SOURCES = logit.c logrotate.c
4752logit_CFLAGS = -W -Wall -Wextra -Wno-unused-parameter -std=gnu99
4853logit_CFLAGS += $(lite_CFLAGS )
@@ -66,7 +71,6 @@ finit_SOURCES = api.c cgroup.c cgroup.h \
6671 sig.c sig.h \
6772 sm.c sm.h \
6873 svc.c svc.h \
69- tmpfiles.c tmpfiles.h \
7074 tty.c tty.h \
7175 util.c util.h \
7276 utmp-api.c utmp-api.h
Original file line number Diff line number Diff line change 5959#define _PATH_RUNPARTS FINIT_EXECPATH_ "/runparts"
6060#define _PATH_SULOGIN FINIT_EXECPATH_ "/sulogin"
6161#define _PATH_GETTY FINIT_EXECPATH_ "/getty"
62+ #define _PATH_TMPFILES FINIT_EXECPATH_ "/tmpfiles"
6263
6364#define CMD_SIZE 1024
6465#define LINE_SIZE 1024
Original file line number Diff line number Diff line change 2323
2424#include "config.h" /* Generated by configure script */
2525
26+ #include <dirent.h>
27+ #include <ftw.h>
28+ #include <glob.h>
29+ #include <libgen.h>
30+ #include <grp.h>
31+ #include <pwd.h>
2632#include <sys/sysmacros.h>
27- #include "finit.h"
33+
34+ #include <stdlib.h>
35+ #include <string.h>
36+ #ifdef _LIBITE_LITE
37+ # include <libite/lite.h>
38+ #else
39+ # include <lite/lite.h>
40+ #endif
41+
2842#include "helpers.h"
29- #include "tmpfiles .h"
43+ #include "log .h"
3044#include "util.h"
3145
3246static int glob_do (const char * path , int (* cb )(const char * ))
@@ -470,7 +484,7 @@ static void tmpfiles(char *line)
470484 * before that to have Finit specific ones sorted first, and
471485 * a configure prefix specific one after that for user needs.
472486 */
473- void tmpfilesd ( void )
487+ int main ( int argc , char * argv [] )
474488{
475489 /* in priority order */
476490 char * dir [] = {
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments