It's logind's job to maintain those user dirs, so avoid automatic clean
up for them. However, we do cover everything within them.
rename enum "ManagerRunningAs" to "SystemdRunningAs" and move it to shared/
Features:
rename enum "ManagerRunningAs" to "SystemdRunningAs" and move it to shared/
Features:
+
+* readahead: merge the three tools into one binary
+
+* systemctl: when stopping a service which has triggres and warning about it actually check the TriggeredBy= deps fields
+
+* send SIGPWR to upower on resume so that it can send out its dbus signal for compat
+
+* vtconsole: don't override kernel cmdline utf8 override setting
+
+* journal: hook up with EFI firmware log, new kmsg logic
+
* falconindy: allow unescaped pathes for mount units, like "systmectl status /.mount"?
* handle C-A-Del in logind, like the power/suspend buttons?
* falconindy: allow unescaped pathes for mount units, like "systmectl status /.mount"?
* handle C-A-Del in logind, like the power/suspend buttons?
<para>The age field only applies to lines starting with
d, D and x. If omitted or set to - no automatic clean-up
is done.</para>
<para>The age field only applies to lines starting with
d, D and x. If omitted or set to - no automatic clean-up
is done.</para>
+
+ <para>If the age field starts with a tilde
+ character (~) the clean-up is only applied to
+ files and directories one level inside the
+ directory specified, but not the files and
+ directories immediately inside it.</para>
bool gid_set:1;
bool mode_set:1;
bool age_set:1;
bool gid_set:1;
bool mode_set:1;
bool age_set:1;
+
+ bool keep_first_level:1;
} Item;
static Hashmap *items = NULL, *globs = NULL;
} Item;
static Hashmap *items = NULL, *globs = NULL;
static const char *arg_prefix = NULL;
static const char *arg_prefix = NULL;
-static const char *conf_file_dirs[] = {
+static const char * const conf_file_dirs[] = {
"/etc/tmpfiles.d",
"/run/tmpfiles.d",
"/usr/local/lib/tmpfiles.d",
"/etc/tmpfiles.d",
"/run/tmpfiles.d",
"/usr/local/lib/tmpfiles.d",
usec_t cutoff,
dev_t rootdev,
bool mountpoint,
usec_t cutoff,
dev_t rootdev,
bool mountpoint,
+ int maxdepth,
+ bool keep_this_level)
{
struct dirent *dent;
struct timespec times[2];
{
struct dirent *dent;
struct timespec times[2];
- q = dir_cleanup(sub_path, sub_dir, &s, cutoff, rootdev, false, maxdepth-1);
+ q = dir_cleanup(sub_path, sub_dir, &s, cutoff, rootdev, false, maxdepth-1, false);
closedir(sub_dir);
if (q < 0)
r = q;
}
closedir(sub_dir);
if (q < 0)
r = q;
}
+ /* Note: if you are wondering why we don't
+ * support the sticky bit for excluding
+ * directories from cleaning like we do it for
+ * other file system objects: well, the sticky
+ * bit already has a meaning for directories,
+ * so we don't want to overload that. */
+
+ if (keep_this_level)
+ continue;
+
/* Ignore ctime, we change it when deleting */
age = MAX(timespec_load(&s.st_mtim),
timespec_load(&s.st_atim));
/* Ignore ctime, we change it when deleting */
age = MAX(timespec_load(&s.st_mtim),
timespec_load(&s.st_atim));
if (S_ISCHR(s.st_mode) || S_ISBLK(s.st_mode))
continue;
if (S_ISCHR(s.st_mode) || S_ISBLK(s.st_mode))
continue;
+ /* Keep files on this level around if this is
+ * requested */
+ if (keep_this_level)
+ 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));
mountpoint = s.st_dev != ps.st_dev ||
(s.st_dev == ps.st_dev && s.st_ino == ps.st_ino);
mountpoint = s.st_dev != ps.st_dev ||
(s.st_dev == ps.st_dev && s.st_ino == ps.st_ino);
- r = dir_cleanup(i->path, d, &s, cutoff, s.st_dev, mountpoint, MAX_DEPTH);
+ r = dir_cleanup(i->path, d, &s, cutoff, s.st_dev, mountpoint, MAX_DEPTH, i->keep_first_level);
i->type == TRUNCATE_DIRECTORY ? 0755 : 0644;
if (age && !streq(age, "-")) {
i->type == TRUNCATE_DIRECTORY ? 0755 : 0644;
if (age && !streq(age, "-")) {
- if (parse_usec(age, &i->age) < 0) {
+ const char *a = age;
+
+ if (*a == '~') {
+ i->keep_first_level = true;
+ a++;
+ }
+
+ if (parse_usec(a, &i->age) < 0) {
log_error("[%s:%u] Invalid age '%s'.", fname, line, age);
r = -EBADMSG;
goto finish;
log_error("[%s:%u] Invalid age '%s'.", fname, line, age);
r = -EBADMSG;
goto finish;
for (j = optind; j < argc; j++) {
char *fragment;
for (j = optind; j < argc; j++) {
char *fragment;
- fragment = resolve_fragment(argv[j], conf_file_dirs);
+ fragment = resolve_fragment(argv[j], (const char**) conf_file_dirs);
if (!fragment) {
log_error("Failed to find a %s file: %m", argv[j]);
r = EXIT_FAILURE;
if (!fragment) {
log_error("Failed to find a %s file: %m", argv[j]);
r = EXIT_FAILURE;
char **files, **f;
r = conf_files_list_strv(&files, ".conf",
char **files, **f;
r = conf_files_list_strv(&files, ".conf",
- (const char **)conf_file_dirs);
+ (const char **) conf_file_dirs);
if (r < 0) {
log_error("Failed to enumerate tmpfiles.d files: %s", strerror(-r));
r = EXIT_FAILURE;
if (r < 0) {
log_error("Failed to enumerate tmpfiles.d files: %s", strerror(-r));
r = EXIT_FAILURE;
# See tmpfiles.d(5) for details
# See tmpfiles.d(5) for details
-d /run/user 0755 root root 10d
+d /run/user 0755 root root ~10d
F /run/utmp 0664 root utmp -
f /var/log/wtmp 0664 root utmp -
F /run/utmp 0664 root utmp -
f /var/log/wtmp 0664 root utmp -