From: Lennart Poettering Date: Mon, 18 Oct 2010 20:38:41 +0000 (+0200) Subject: tmpfiles: integrate kay's directory cleanup code and otherwise beef up tmpfiles quite... X-Git-Tag: v12~217 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=3b63d2d31d0850bd7a81ab9b468218d2c4c461e8 tmpfiles: integrate kay's directory cleanup code and otherwise beef up tmpfiles quite a bit --- diff --git a/Makefile.am b/Makefile.am index f129525f2..031130282 100644 --- a/Makefile.am +++ b/Makefile.am @@ -204,9 +204,8 @@ dist_systemunit_DATA = \ units/printer.target \ units/bluetooth.target \ units/smartcard.target \ - units/tmpwatch.service \ - units/tmpwatch.timer \ - units/systemd-readahead-done.timer + units/systemd-readahead-done.timer \ + units/systemd-tmpfiles-clean.timer nodist_systemunit_DATA = \ units/sysinit.target \ @@ -229,7 +228,8 @@ nodist_systemunit_DATA = \ units/systemd-readahead-collect.service \ units/systemd-readahead-replay.service \ units/systemd-readahead-done.service \ - units/systemd-tmpfiles.service \ + units/systemd-tmpfiles-setup.service \ + units/systemd-tmpfiles-clean.service \ units/systemd-user-sessions.service \ units/syslog.target \ units/halt.service \ @@ -266,7 +266,8 @@ EXTRA_DIST = \ units/systemd-readahead-collect.service.in \ units/systemd-readahead-replay.service.in \ units/systemd-readahead-done.service.in \ - units/systemd-tmpfiles.service.in \ + units/systemd-tmpfiles-setup.service.in \ + units/systemd-tmpfiles-clean.service.in \ units/systemd-user-sessions.service.in \ units/syslog.target.in \ units/halt.service.in \ @@ -1093,10 +1094,9 @@ install-data-hook: systemd-vconsole-setup.service \ systemd-modules-load.service \ systemd-random-seed-load.service \ - systemd-tmpfiles.service \ + systemd-tmpfiles-setup.service \ sysctl.service \ - tmpwatch.timer \ - tmpwatch.service && \ + systemd-tmpfiles-clean.timer && \ $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \ $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \ $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \ @@ -1105,10 +1105,9 @@ install-data-hook: $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service && \ $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \ $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \ - $(LN_S) ../systemd-tmpfiles.service systemd-tmpfiles.service && \ + $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \ $(LN_S) ../sysctl.service sysctl.service && \ - $(LN_S) ../tmpwatch.timer tmpwatch.timer && \ - $(LN_S) ../tmpwatch.service tmpwatch.service ) + $(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer ) ( cd $(DESTDIR)$(dbussessionservicedir) && \ rm -f org.freedesktop.systemd1.service && \ $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service ) diff --git a/TODO b/TODO index 709eb7183..a1bdcade1 100644 --- a/TODO +++ b/TODO @@ -50,13 +50,13 @@ * exec /sbin/poweroff as PID 1 and do the shutdown -* kexec, suspend, resume +* suspend, resume * passphrase agent https://bugs.freedesktop.org/show_bug.cgi?id=30038 * systemctl auto-pager a la git -* fsck setup: quota flag, check kcmdline/forcefsck, reboot, single user +* fsck setup: quota flag, check kcmdline/forcefsck, reboot, single user, ac plug * merge CK @@ -68,8 +68,6 @@ * document locale.conf, vconsole.conf and possibly the tempfiles.d and modules-load.d mechanism. -* beefed up tmpwatch that reads tmpfiles.d - * enable syslog.socket by default, activating our kmsg bridge * when processes remain in a service even though the start command failed enter active diff --git a/src/macro.h b/src/macro.h index 12ccbb151..b3da60f13 100644 --- a/src/macro.h +++ b/src/macro.h @@ -57,19 +57,29 @@ static inline size_t PAGE_ALIGN(size_t l) { #define ELEMENTSOF(x) (sizeof(x)/sizeof((x)[0])) +#ifndef MAX #define MAX(a,b) \ __extension__ ({ \ typeof(a) _a = (a); \ typeof(b) _b = (b); \ _a > _b ? _a : _b; \ }) +#endif + +#define MAX3(a,b,c) \ + MAX(MAX(a,b),c) +#ifndef MIN #define MIN(a,b) \ __extension__ ({ \ typeof(a) _a = (a); \ typeof(b) _b = (b); \ _a < _b ? _a : _b; \ }) +#endif + +#define MIN3(a,b,c) \ + MIN(MIN(a,b),c) #define CLAMP(x, low, high) \ __extension__ ({ \ diff --git a/src/tmpfiles.c b/src/tmpfiles.c index 13e830db5..495364925 100644 --- a/src/tmpfiles.c +++ b/src/tmpfiles.c @@ -3,7 +3,7 @@ /*** This file is part of systemd. - Copyright 2010 Lennart Poettering + Copyright 2010 Lennart Poettering, Kay Sievers systemd is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,11 +28,20 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include #include "log.h" #include "util.h" #include "strv.h" #include "label.h" +#include "set.h" /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates * them in the file system. This is intended to be used to create @@ -40,188 +49,555 @@ * /var/lock which are volatile and hence need to be recreated on * bootup. */ -static int process_line(const char *fname, unsigned line, const char *buffer, const char *prefix) { +enum { + CREATE_FILE = 'f', + TRUNCATE_FILE = 'F', + CREATE_DIRECTORY = 'd', + TRUNCATE_DIRECTORY = 'D', + IGNORE_PATH = 'x', + REMOVE_PATH = 'r', + RECURSIVE_REMOVE_PATH = 'R' +}; + +typedef struct Item { char type; - char *path = NULL; - unsigned mode; - char *user = NULL, *group = NULL; + + char *path; uid_t uid; gid_t gid; - bool uid_set = false, gid_set = false; - int n, fd = -1, r; + mode_t mode; + usec_t age; + + bool uid_set:1; + bool gid_set:1; + bool mode_set:1; + bool age_set:1; +} Item; + +static Hashmap *items = NULL; + +static bool arg_create = false; +static bool arg_clean = false; +static bool arg_remove = false; + +#define MAX_DEPTH 256 + +static int dir_cleanup( + const char *p, + DIR *d, + const struct stat *ds, + usec_t cutoff, + dev_t rootdev, + bool mountpoint, + int maxdepth) +{ + struct dirent *dent; + struct timespec times[2]; + bool deleted = false; + char *sub_path = NULL; + int r = 0; + + while ((dent = readdir(d))) { + struct stat s; + usec_t age; + + if (streq(dent->d_name, ".") || + streq(dent->d_name, "..")) + continue; - assert(fname); - assert(line >= 1); - assert(buffer); + if (fstatat(dirfd(d), dent->d_name, &s, AT_SYMLINK_NOFOLLOW) < 0) { - if ((n = sscanf(buffer, - "%c " - "%ms " - "%o " - "%ms " - "%ms ", - &type, - &path, - &mode, - &user, - &group)) < 2) { - log_error("[%s:%u] Syntax error.", fname, line); - r = -EIO; + if (errno != ENOENT) { + log_error("stat(%s/%s) failed: %m", p, dent->d_name); + r = -errno; + } + + continue; + } + + /* Stay on the same filesystem */ + if (s.st_dev != rootdev) + continue; + + /* Do not delete read-only files owned by root */ + if (s.st_uid == 0 && !(s.st_mode & S_IWUSR)) + continue; + + free(sub_path); + sub_path = NULL; + + if (asprintf(&sub_path, "%s/%s", p, dent->d_name) < 0) { + log_error("Out of memory"); + r = -ENOMEM; + goto finish; + } + + /* Is there an item configured for this path? */ + if (hashmap_get(items, sub_path)) + continue; + + if (S_ISDIR(s.st_mode)) { + + if (mountpoint && + streq(dent->d_name, "lost+found") && + s.st_uid == 0) + continue; + + if (maxdepth <= 0) + log_warning("Reached max depth on %s.", sub_path); + else { + DIR *sub_dir; + int q; + + sub_dir = xopendirat(dirfd(d), dent->d_name); + if (sub_dir == NULL) { + if (errno != ENOENT) { + log_error("opendir(%s/%s) failed: %m", p, dent->d_name); + r = -errno; + } + + continue; + } + + q = dir_cleanup(sub_path, sub_dir, &s, cutoff, rootdev, false, maxdepth-1); + closedir(sub_dir); + + if (q < 0) + r = q; + } + + /* Ignore ctime, we change it when deleting */ + age = MAX(timespec_load(&s.st_mtim), + timespec_load(&s.st_atim)); + if (age >= cutoff) + continue; + + log_debug("rmdir '%s'\n", sub_path); + + if (unlinkat(dirfd(d), dent->d_name, AT_REMOVEDIR) < 0) { + if (errno != ENOENT && errno != ENOTEMPTY) { + log_error("rmdir(%s): %m", sub_path); + r = -errno; + } + } + + } else { + if (mountpoint) { + if (streq(dent->d_name, ".journal") && + s.st_uid == 0) + continue; + + if (streq(dent->d_name, "aquota.user") || + streq(dent->d_name, "aquota.group")) + continue; + } + + age = MAX3(timespec_load(&s.st_mtim), + timespec_load(&s.st_atim), + timespec_load(&s.st_ctim)); + + if (age >= cutoff) + continue; + + log_debug("unlink '%s'\n", sub_path); + + if (unlinkat(dirfd(d), dent->d_name, 0) < 0) { + if (errno != ENOENT) { + log_error("unlink(%s): %m", sub_path); + r = -errno; + } + } + + deleted = true; + } + } + +finish: + if (deleted) { + /* Restore original directory timestamps */ + times[0] = ds->st_atim; + times[1] = ds->st_mtim; + + if (futimens(dirfd(d), times) < 0) + log_error("utimensat(%s): %m", p); + } + + free(sub_path); + + return r; +} + +static int clean_item(Item *i) { + DIR *d; + struct stat s, ps; + bool mountpoint; + int r; + usec_t cutoff, n; + + assert(i); + + if (i->type != CREATE_DIRECTORY && + i->type != TRUNCATE_DIRECTORY && + i->type != IGNORE_PATH) + return 0; + + if (!i->age_set || i->age <= 0) + return 0; + + n = now(CLOCK_REALTIME); + if (n < i->age) + return 0; + + cutoff = n - i->age; + + d = opendir(i->path); + if (!d) { + if (errno == ENOENT) + return 0; + + log_error("Failed to open directory %s: %m", i->path); + return -errno; + } + + if (fstat(dirfd(d), &s) < 0) { + log_error("stat(%s) failed: %m", i->path); + r = -errno; goto finish; } - if (type != 'f' && type != 'd') { - log_error("[%s:%u] Unknown file type '%c'.", fname, line, type); - r = -EBADMSG; + if (!S_ISDIR(s.st_mode)) { + log_error("%s is not a directory.", i->path); + r = -ENOTDIR; goto finish; } - if (prefix && !path_startswith(path, prefix)) { - r = 0; + if (fstatat(dirfd(d), "..", &ps, AT_SYMLINK_NOFOLLOW) != 0) { + log_error("stat(%s/..) failed: %m", i->path); + r = -errno; goto finish; } - if (user && !streq(user, "-")) { - unsigned long lu; - struct passwd *p; + mountpoint = s.st_dev != ps.st_dev || + (s.st_dev == ps.st_dev && s.st_ino == ps.st_ino); - if (streq(user, "root") || streq(user, "0")) - uid = 0; - else if (safe_atolu(user, &lu) >= 0) - uid = (uid_t) lu; - else if ((p = getpwnam(user))) - uid = p->pw_uid; - else { - log_error("[%s:%u] Unknown user '%s'.", fname, line, user); - r = -ENOENT; - goto finish; - } + r = dir_cleanup(i->path, d, &s, cutoff, s.st_dev, mountpoint, MAX_DEPTH); - uid_set = true; - } +finish: + if (d) + closedir(d); - if (group && !streq(group, "-")) { - unsigned long lu; - struct group *g; + return r; +} - if (streq(group, "root") || streq(group, "0")) - gid = 0; - else if (safe_atolu(group, &lu) >= 0) - gid = (gid_t) lu; - else if ((g = getgrnam(group))) - gid = g->gr_gid; - else { - log_error("[%s:%u] Unknown group '%s'.", fname, line, group); - r = -ENOENT; - goto finish; - } +static int create_item(Item *i) { + int fd = -1, r; + mode_t u; + struct stat st; - gid_set = true; - } + assert(i); - if (n < 3) - mode = type == 'f' ? 0644 : 0755; + switch (i->type) { + + case IGNORE_PATH: + case REMOVE_PATH: + case RECURSIVE_REMOVE_PATH: + return 0; - if (type == 'f') { - mode_t u; - struct stat st; + case CREATE_FILE: + case TRUNCATE_FILE: u = umask(0); - fd = open(path, O_CREAT|O_NDELAY|O_CLOEXEC|O_WRONLY|O_NOCTTY|O_NOFOLLOW, mode); + fd = open(i->path, O_CREAT|O_NDELAY|O_CLOEXEC|O_WRONLY|O_NOCTTY|O_NOFOLLOW| + (i->type == TRUNCATE_FILE ? O_TRUNC : 0), i->mode); umask(u); if (fd < 0) { - log_error("Failed to create file %s: %m", path); + log_error("Failed to create file %s: %m", i->path); r = -errno; goto finish; } if (fstat(fd, &st) < 0) { - log_error("stat(%s) failed: %m", path); + log_error("stat(%s) failed: %m", i->path); r = -errno; goto finish; } if (!S_ISREG(st.st_mode)) { - log_error("%s is not a file.", path); + log_error("%s is not a file.", i->path); r = -EEXIST; goto finish; } - if (fchmod(fd, mode) < 0) { - log_error("chmod(%s) failed: %m", path); - r = -errno; - goto finish; - } - - if (uid_set || gid_set) { + if (i->mode_set) + if (fchmod(fd, i->mode) < 0) { + log_error("chmod(%s) failed: %m", i->path); + r = -errno; + goto finish; + } + if (i->uid_set || i->gid_set) if (fchown(fd, - uid_set ? uid : (uid_t) -1, - gid_set ? gid : (gid_t) -1) < 0) { - log_error("chown(%s) failed: %m", path); + i->uid_set ? i->uid : (uid_t) -1, + i->gid_set ? i->gid : (gid_t) -1) < 0) { + log_error("chown(%s) failed: %m", i->path); r = -errno; goto finish; } - } - } else if (type == 'd') { - mode_t u; - struct stat st; + break; + + case TRUNCATE_DIRECTORY: + case CREATE_DIRECTORY: u = umask(0); - r = mkdir(path, mode); + r = mkdir(i->path, i->mode); umask(u); if (r < 0 && errno != EEXIST) { - log_error("Failed to create directory %s: %m", path); + log_error("Failed to create directory %s: %m", i->path); r = -errno; goto finish; } - if (stat(path, &st) < 0) { - log_error("stat(%s) failed: %m", path); + if (stat(i->path, &st) < 0) { + log_error("stat(%s) failed: %m", i->path); r = -errno; goto finish; } if (!S_ISDIR(st.st_mode)) { - log_error("%s is not a directory.", path); + log_error("%s is not a directory.", i->path); r = -EEXIST; goto finish; } - if (chmod(path, mode) < 0) { - log_error("chmod(%s) failed: %m", path); - r = -errno; - goto finish; - } + if (i->mode_set) + if (chmod(i->path, i->mode) < 0) { + log_error("chmod(%s) failed: %m", i->path); + r = -errno; + goto finish; + } - if (uid_set || gid_set) { + if (i->uid_set || i->gid_set) + if (chown(i->path, + i->uid_set ? i->uid : (uid_t) -1, + i->gid_set ? i->gid : (gid_t) -1) < 0) { - if (chown(path, - uid_set ? uid : (uid_t) -1, - gid_set ? gid : (gid_t) -1) < 0) { - log_error("chown(%s) failed: %m", path); + log_error("chown(%s) failed: %m", i->path); r = -errno; goto finish; } + + break; + } + + if ((r = label_fix(i->path)) < 0) + goto finish; + + log_debug("%s created successfully.", i->path); + +finish: + if (fd >= 0) + close_nointr_nofail(fd); + + return r; +} + +static int remove_item(Item *i) { + int r; + + assert(i); + + switch (i->type) { + + case CREATE_FILE: + case TRUNCATE_FILE: + case CREATE_DIRECTORY: + case IGNORE_PATH: + break; + + case REMOVE_PATH: + if (remove(i->path) < 0 && errno != ENOENT) { + log_error("remove(%s): %m", i->path); + return -errno; } + + break; + + case TRUNCATE_DIRECTORY: + case RECURSIVE_REMOVE_PATH: + if ((r = rm_rf(i->path, false, i->type == RECURSIVE_REMOVE_PATH)) < 0 && + r != -ENOENT) { + log_error("rm_rf(%s): %s", i->path, strerror(-r)); + return r; + } + + break; + } + + return 0; +} + +static int process_item(Item *i) { + int r, q, p; + + assert(i); + + r = arg_create ? create_item(i) : 0; + q = arg_remove ? remove_item(i) : 0; + p = arg_clean ? clean_item(i) : 0; + + if (r < 0) + return r; + + if (q < 0) + return q; + + return p; +} + +static void item_free(Item *i) { + assert(i); + + free(i->path); + free(i); +} + +static int parse_line(const char *fname, unsigned line, const char *buffer, const char *prefix) { + Item *i; + char *mode = NULL, *user = NULL, *group = NULL, *age = NULL; + int r, n; + + assert(fname); + assert(line >= 1); + assert(buffer); + + if (!(i = new0(Item, 1))) { + log_error("Out of memory"); + return -ENOMEM; + } + + if ((n = sscanf(buffer, + "%c " + "%ms " + "%ms " + "%ms " + "%ms " + "%ms", + &i->type, + &i->path, + &mode, + &user, + &group, + &age)) < 2) { + log_error("[%s:%u] Syntax error.", fname, line); + r = -EIO; + goto finish; } - if ((r = label_fix(path)) < 0) + if (i->type != CREATE_FILE && + i->type != CREATE_DIRECTORY && + i->type != TRUNCATE_FILE && + i->type != IGNORE_PATH && + i->type != REMOVE_PATH && + i->type != RECURSIVE_REMOVE_PATH) { + log_error("[%s:%u] Unknown file type '%c'.", fname, line, i->type); + r = -EBADMSG; goto finish; + } + + if (!path_is_absolute(i->path)) { + log_error("[%s:%u] Path '%s' not absolute.", fname, line, i->path); + r = -EBADMSG; + goto finish; + } + + path_kill_slashes(i->path); + + if (prefix && !path_startswith(i->path, prefix)) { + r = 0; + goto finish; + } - log_debug("%s created successfully.", path); + if (user && !streq(user, "-")) { + unsigned long lu; + struct passwd *p; + + if (streq(user, "root") || streq(user, "0")) + i->uid = 0; + else if (safe_atolu(user, &lu) >= 0) + i->uid = (uid_t) lu; + else if ((p = getpwnam(user))) + i->uid = p->pw_uid; + else { + log_error("[%s:%u] Unknown user '%s'.", fname, line, user); + r = -ENOENT; + goto finish; + } + + i->uid_set = true; + } + + if (group && !streq(group, "-")) { + unsigned long lu; + struct group *g; + + if (streq(group, "root") || streq(group, "0")) + i->gid = 0; + else if (safe_atolu(group, &lu) >= 0) + i->gid = (gid_t) lu; + else if ((g = getgrnam(group))) + i->gid = g->gr_gid; + else { + log_error("[%s:%u] Unknown group '%s'.", fname, line, group); + r = -ENOENT; + goto finish; + } + + i->gid_set = true; + } + + if (mode && !streq(mode, "-")) { + unsigned m; + + if (sscanf(mode, "%o", &m) != 1) { + log_error("[%s:%u] Invalid mode '%s'.", fname, line, mode); + r = -ENOENT; + goto finish; + } + + i->mode = m; + i->mode_set = true; + } else + i->mode = i->type == CREATE_DIRECTORY ? 0755 : 0644; + + if (age && !streq(age, "-")) { + if (parse_usec(age, &i->age) < 0) { + log_error("[%s:%u] Invalid age '%s'.", fname, line, age); + r = -EBADMSG; + goto finish; + } + + i->age_set = true; + } + + if ((r = hashmap_put(items, i->path, i)) < 0) { + log_error("Failed to insert item %s: %s", i->path, strerror(-r)); + goto finish; + } + + i = NULL; r = 0; finish: - free(path); free(user); free(group); + free(mode); + free(age); - if (fd >= 0) - close_nointr_nofail(fd); + if (i) + item_free(i); return r; } @@ -239,16 +615,89 @@ static int scandir_filter(const struct dirent *d) { return endswith(d->d_name, ".conf"); } +static int help(void) { + + printf("%s [OPTIONS...]\n\n" + "Create and clean up temporary directories.\n\n" + " -h --help Show this help\n" + " --create Create marked files/directories\n" + " --clean Clean up marked directories\n" + " --remove Remove marked files/directories\n", + program_invocation_short_name); + + return 0; +} + +static int parse_argv(int argc, char *argv[]) { + + enum { + ARG_CREATE, + ARG_CLEAN, + ARG_REMOVE + }; + + static const struct option options[] = { + { "help", no_argument, NULL, 'h' }, + { "create", no_argument, NULL, ARG_CREATE }, + { "clean", no_argument, NULL, ARG_CLEAN }, + { "remove", no_argument, NULL, ARG_REMOVE }, + { NULL, 0, NULL, 0 } + }; + + int c; + + assert(argc >= 0); + assert(argv); + + while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) { + + switch (c) { + + case 'h': + help(); + return 0; + + case ARG_CREATE: + arg_create = true; + break; + + case ARG_CLEAN: + arg_clean = true; + break; + + case ARG_REMOVE: + arg_remove = true; + break; + + case '?': + return -EINVAL; + + default: + log_error("Unknown option code %c", c); + return -EINVAL; + } + } + + if (!arg_clean && !arg_create && !arg_remove) { + help(); + return -EINVAL; + } + + return 1; +} + int main(int argc, char *argv[]) { struct dirent **de = NULL; - int r = EXIT_FAILURE, n, i; + int r, n, j; const char *prefix = NULL; + Item *i; + Iterator iterator; + + if ((r = parse_argv(argc, argv)) <= 0) + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; - if (argc > 2) { - log_error("This program takes no more than one argument."); - return EXIT_FAILURE; - } else if (argc > 1) - prefix = argv[1]; + if (optind < argc) + prefix = argv[optind]; else prefix = "/"; @@ -258,26 +707,34 @@ int main(int argc, char *argv[]) { label_init(); + if (!(items = hashmap_new(string_hash_func, string_compare_func))) { + log_error("Out of memory"); + r = EXIT_FAILURE; + goto finish; + } + if ((n = scandir("/etc/tmpfiles.d/", &de, scandir_filter, alphasort)) < 0) { if (errno == ENOENT) r = EXIT_SUCCESS; - else + else { log_error("Failed to enumerate /etc/tmpfiles.d/ files: %m"); + r = EXIT_FAILURE; + } goto finish; } r = EXIT_SUCCESS; - for (i = 0; i < n; i++) { + for (j = 0; j < n; j++) { int k; char *fn; FILE *f; - unsigned j; + unsigned v; - k = asprintf(&fn, "/etc/tmpfiles.d/%s", de[i]->d_name); - free(de[i]); + k = asprintf(&fn, "/etc/tmpfiles.d/%s", de[j]->d_name); + free(de[j]); if (k < 0) { log_error("Failed to allocate file name."); @@ -286,26 +743,30 @@ int main(int argc, char *argv[]) { } if (!(f = fopen(fn, "re"))) { - log_error("Failed to open %s: %m", fn); + + if (errno != ENOENT) { + log_error("Failed to open %s: %m", fn); + r = EXIT_FAILURE; + } + free(fn); - r = EXIT_FAILURE; continue; } - j = 0; + v = 0; for (;;) { char line[LINE_MAX], *l; if (!(fgets(line, sizeof(line), f))) break; - j++; + v++; l = strstrip(line); if (*l == '#' || *l == 0) continue; - if (process_line(fn, j, l, prefix) < 0) + if (parse_line(fn, v, l, prefix) < 0) r = EXIT_FAILURE; } @@ -321,7 +782,15 @@ int main(int argc, char *argv[]) { free(de); + HASHMAP_FOREACH(i, items, iterator) + if (process_item(i) < 0) + r = EXIT_FAILURE; + finish: + while ((i = hashmap_steal_first(items))) + item_free(i); + + hashmap_free(items); return r; } diff --git a/src/util.c b/src/util.c index 434f311e7..5df78344a 100644 --- a/src/util.c +++ b/src/util.c @@ -3333,6 +3333,10 @@ bool null_or_empty(struct stat *st) { return false; } +DIR *xopendirat(int fd, const char *name) { + return fdopendir(openat(fd, name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)); +} + static const char *const ioprio_class_table[] = { [IOPRIO_CLASS_NONE] = "none", [IOPRIO_CLASS_RT] = "realtime", diff --git a/src/util.h b/src/util.h index 2bf86d997..e87fb23bf 100644 --- a/src/util.h +++ b/src/util.h @@ -32,6 +32,7 @@ #include #include #include +#include #include "macro.h" @@ -361,6 +362,8 @@ _noreturn_ void freeze(void); bool null_or_empty(struct stat *st); +DIR *xopendirat(int dirfd, const char *name); + #define NULSTR_FOREACH(i, l) \ for ((i) = (l); (i) && *(i); (i) = strchr((i), 0)+1) diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf index ee326f082..e93b736be 100644 --- a/tmpfiles.d/systemd.conf +++ b/tmpfiles.d/systemd.conf @@ -5,6 +5,12 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -d /var/lock/subsys 0755 root root -d /var/run/user 0755 root root -f /var/run/utmp 0664 root utmp +d /var/lock/subsys 0755 root root 10d +d /var/run/user 0755 root root 10d +F /var/run/utmp 0664 root utmp - +f /var/log/wtmp 0644 root utmp - + +d /tmp 1777 root root 10d +d /var/tmp 1777 root root 30d + +d /var/cache/man - - - 30d diff --git a/tmpfiles.d/x11.conf b/tmpfiles.d/x11.conf index d23c052de..a982d3042 100644 --- a/tmpfiles.d/x11.conf +++ b/tmpfiles.d/x11.conf @@ -5,5 +5,21 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -d /tmp/.X11-unix 1777 root root -d /tmp/.ICE-unix 1777 root root +# Make sure these are created by default so that nobody else can +d /tmp/.X11-unix 1777 root root 10d +d /tmp/.ICE-unix 1777 root root 10d +d /tmp/.XIM-unix 1777 root root 10d +d /tmp/.font-unix 1777 root root 10d +d /tmp/.Test-unix 1777 root root 10d + +# Unlink the X11 lock files +r /tmp/.X0-lock +r /tmp/.X1-lock +r /tmp/.X2-lock +r /tmp/.X3-lock +r /tmp/.X4-lock +r /tmp/.X5-lock +r /tmp/.X6-lock +r /tmp/.X7-lock +r /tmp/.X8-lock +r /tmp/.X9-lock diff --git a/units/.gitignore b/units/.gitignore index 77d7e2869..464e4bbd4 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -1,3 +1,5 @@ +systemd-tmpfiles-clean.service +systemd-tmpfiles-setup.service halt.service poweroff.service reboot.service diff --git a/units/tmpwatch.service b/units/systemd-tmpfiles-clean.service.in similarity index 71% rename from units/tmpwatch.service rename to units/systemd-tmpfiles-clean.service.in index 636faf936..3b27330e0 100644 --- a/units/tmpwatch.service +++ b/units/systemd-tmpfiles-clean.service.in @@ -10,10 +10,10 @@ Description=Cleanup of Temporary Directories DefaultDependencies=no Wants=local-fs.target After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target -Before=basic.target poweroff.service reboot.service halt.service killall.service +Before=basic.target shutdown.target +ConditionPathExists=/etc/tmpfiles.d [Service] Type=oneshot -ExecStart=/usr/sbin/tmpwatch -umc -x /tmp/.X11-unix -x /tmp/.ICE-unix 10d /tmp -ExecStart=/usr/sbin/tmpwatch -umc 30d /var/tmp +ExecStart=@rootlibexecdir@/systemd-tmpfiles --clean IOSchedulingClass=idle diff --git a/units/tmpwatch.timer b/units/systemd-tmpfiles-clean.timer similarity index 95% rename from units/tmpwatch.timer rename to units/systemd-tmpfiles-clean.timer index 54ad57289..d8529a8d7 100644 --- a/units/tmpwatch.timer +++ b/units/systemd-tmpfiles-clean.timer @@ -9,5 +9,5 @@ Description=Daily Cleanup of Temporary Directories [Timer] -OnBootSec=1d +OnBootSec=15min OnUnitActiveSec=1d diff --git a/units/systemd-tmpfiles.service.in b/units/systemd-tmpfiles-setup.service.in similarity index 85% rename from units/systemd-tmpfiles.service.in rename to units/systemd-tmpfiles-setup.service.in index 855573e2b..df80e82be 100644 --- a/units/systemd-tmpfiles.service.in +++ b/units/systemd-tmpfiles-setup.service.in @@ -11,8 +11,9 @@ DefaultDependencies=no Wants=local-fs.target After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target Before=basic.target shutdown.target +ConditionPathExists=/etc/tmpfiles.d [Service] Type=oneshot RemainAfterExit=yes -ExecStart=@rootlibexecdir@/systemd-tmpfiles +ExecStart=@rootlibexecdir@/systemd-tmpfiles --create --remove