Skip to content

tmpfiles: refactor into separate executable #439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
troglobit merged 5 commits into from
Jun 9, 2025
Merged

tmpfiles: refactor into separate executable #439

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1921b3f
tmpfiles: refactor into separate executable
aanderse May 24, 2025
ff95ebe
tmpfiles: split up create & remove logic
aanderse Jun 1, 2025
a571012
tmpfiles: add --create and --remove flags
aanderse Jun 1, 2025
2957246
tmpfiles: implement remove logic for 'D'
aanderse Jun 1, 2025
5993b4b
tmpfiles: refactor code into new is_dir_empty function
aanderse Jun 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions plugins/bootmisc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include "finit.h"
#include "helpers.h"
#include "plugin.h"
#include "tmpfiles.h"
#include "util.h"
#include "utmp-api.h"

Expand Down Expand Up @@ -163,7 +162,7 @@ static void setup(void *arg)
kernel_links();

/* Create all system tmpfiles.d(5) */
tmpfilesd();
run_interactive(_PATH_TMPFILES " --create", "Creating required directories and files");

/* Set BOOT_TIME UTMP entry */
utmp_set_boot();
Expand Down
10 changes: 8 additions & 2 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ AM_LDFLAGS = -export-dynamic
endif

sbin_PROGRAMS = finit initctl
pkglibexec_PROGRAMS = getty logit runparts
pkglibexec_PROGRAMS = getty logit runparts tmpfiles
if SULOGIN
pkglibexec_PROGRAMS += sulogin
endif
Expand Down Expand Up @@ -43,6 +43,13 @@ sulogin_SOURCES = sulogin.c
sulogin_CFLAGS = -W -Wall -Wextra -std=gnu99
sulogin_LDADD = -lcrypt

tmpfiles_SOURCES = tmpfiles.c helpers.c util.c exec.c log.c \
svc.c sig.c sm.c api.c mount.c service.c schedule.c cond.c cond-w.c pid.c plugin.c \
utmp-api.c client.c cgroup.c mdadm.c tty.c iwatch.c conf.c devmon.c logrotate.c
tmpfiles_CFLAGS = -W -Wall -Wextra -std=gnu99 -D__FINIT__
tmpfiles_CFLAGS += $(lite_CFLAGS) $(uev_CFLAGS)
tmpfiles_LDADD = $(lite_LIBS) $(uev_LIBS)

logit_SOURCES = logit.c logrotate.c
logit_CFLAGS = -W -Wall -Wextra -Wno-unused-parameter -std=gnu99
logit_CFLAGS += $(lite_CFLAGS)
Expand All @@ -66,7 +73,6 @@ finit_SOURCES = api.c cgroup.c cgroup.h \
sig.c sig.h \
sm.c sm.h \
svc.c svc.h \
tmpfiles.c tmpfiles.h \
tty.c tty.h \
util.c util.h \
utmp-api.c utmp-api.h
Expand Down
1 change: 1 addition & 0 deletions src/finit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
#define _PATH_RUNPARTS FINIT_EXECPATH_ "/runparts"
#define _PATH_SULOGIN FINIT_EXECPATH_ "/sulogin"
#define _PATH_GETTY FINIT_EXECPATH_ "/getty"
#define _PATH_TMPFILES FINIT_EXECPATH_ "/tmpfiles"

#define CMD_SIZE 1024
#define LINE_SIZE 1024
Expand Down
Loading