Skip to content

Commit 202b878

Browse files
committed
tmpfiles: refactor into separate executable (TODO: squash commit)
1 parent 4a1b04d commit 202b878

File tree

2 files changed

+28
-4
lines changed

2 files changed

+28
-4
lines changed

src/Makefile.am

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,12 @@ sulogin_SOURCES = sulogin.c
4343
sulogin_CFLAGS = -W -Wall -Wextra -std=gnu99
4444
sulogin_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)
46+
tmpfiles_SOURCES = tmpfiles.c helpers.c util.c exec.c log.c \
47+
svc.c sig.c sm.c api.c mount.c service.c schedule.c cond.c cond-w.c pid.c plugin.c \
48+
utmp-api.c client.c cgroup.c mdadm.c tty.c iwatch.c conf.c devmon.c logrotate.c
49+
tmpfiles_CFLAGS = -W -Wall -Wextra -std=gnu99 -D__FINIT__
50+
tmpfiles_CFLAGS += $(lite_CFLAGS) $(uev_CFLAGS)
51+
tmpfiles_LDADD = $(lite_LIBS) $(uev_LIBS)
5052

5153
logit_SOURCES = logit.c logrotate.c
5254
logit_CFLAGS = -W -Wall -Wextra -Wno-unused-parameter -std=gnu99

src/tmpfiles.c

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,32 @@
3939
# include <lite/lite.h>
4040
#endif
4141

42+
#include "svc.h"
4243
#include "helpers.h"
4344
#include "log.h"
4445
#include "util.h"
4546

47+
int debug;
48+
int runlevel;
49+
char *osheading;
50+
svc_t *wdog;
51+
uev_ctx_t *ctx;
52+
int syncsec;
53+
int rescue;
54+
char *network;
55+
int cfglevel;
56+
char *finit_rcsd;
57+
char *sdown;
58+
char *hostname;
59+
int bootstrap;
60+
int single;
61+
int readiness;
62+
char *finit_conf;
63+
char *fstab;
64+
int prevlevel;
65+
int cmdlevel;
66+
int kerndebug;
67+
4668
static int glob_do(const char *path, int (*cb)(const char *))
4769
{
4870
int rc = 0;

0 commit comments

Comments
 (0)