chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dev: use /dev/.run/systemd as runtime directory, instead of /dev/.systemd
[elogind.git]
/
src
/
tmpfiles.c
diff --git
a/src/tmpfiles.c
b/src/tmpfiles.c
index 01668da87e142c8a3711424e1c05e47c55080425..68af37aab0eb43f27edb0fb3062a0ff08cbebb3d 100644
(file)
--- a/
src/tmpfiles.c
+++ b/
src/tmpfiles.c
@@
-147,6
+147,8
@@
static void load_unix_sockets(void) {
if (!(s = strdup(p)))
goto fail;
if (!(s = strdup(p)))
goto fail;
+ path_kill_slashes(s);
+
if ((k = set_put(unix_sockets, s)) < 0) {
free(s);
if ((k = set_put(unix_sockets, s)) < 0) {
free(s);
@@
-301,6
+303,10
@@
static int dir_cleanup(
if (S_ISSOCK(s.st_mode) && unix_socket_alive(sub_path))
continue;
if (S_ISSOCK(s.st_mode) && unix_socket_alive(sub_path))
continue;
+ /* Ignore device nodes */
+ if (S_ISCHR(s.st_mode) || S_ISBLK(s.st_mode))
+ continue;
+
age = MAX3(timespec_load(&s.st_mtim),
timespec_load(&s.st_atim),
timespec_load(&s.st_ctim));
age = MAX3(timespec_load(&s.st_mtim),
timespec_load(&s.st_atim),
timespec_load(&s.st_ctim));
@@
-501,7
+507,7
@@
static int create_item(Item *i) {
break;
}
break;
}
- if ((r = label_fix(i->path)) < 0)
+ if ((r = label_fix(i->path
, false
)) < 0)
goto finish;
log_debug("%s created successfully.", i->path);
goto finish;
log_debug("%s created successfully.", i->path);
@@
-769,7
+775,8
@@
static int scandir_filter(const struct dirent *d) {
return 0;
if (d->d_type != DT_REG &&
return 0;
if (d->d_type != DT_REG &&
- d->d_type != DT_LNK)
+ d->d_type != DT_LNK &&
+ d->d_type != DT_UNKNOWN)
return 0;
return endswith(d->d_name, ".conf");
return 0;
return endswith(d->d_name, ".conf");
@@
-846,7
+853,7
@@
static int parse_argv(int argc, char *argv[]) {
}
if (!arg_clean && !arg_create && !arg_remove) {
}
if (!arg_clean && !arg_create && !arg_remove) {
- log_error("You need to specify at leat one of --clean, --create or --remove.");
+ log_error("You need to specify at lea
s
t one of --clean, --create or --remove.");
return -EINVAL;
}
return -EINVAL;
}