f07c101695
- Add tmpfiles-X-type.patch: allow to clean directories with removing them. - Add systemd-fix-merge-ignore-dependencies.patch: fix merging with --ignore-dependencies waiting for dependencies (bnc#800365). - Update systemd-numlock-suse.patch: udev-trigger.service is now called systemd-udev-trigger.service. - Add improve-man-environment.patch: improve manpage regarding Environment value. OBS-URL: https://build.opensuse.org/request/show/150151 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=333
370 lines
13 KiB
Diff
370 lines
13 KiB
Diff
From 78a92a5a2306709e4587e332728a76901323ade9 Mon Sep 17 00:00:00 2001
|
|
From: Michal Sekletar <msekleta@redhat.com>
|
|
Date: Fri, 18 Jan 2013 16:13:08 +0100
|
|
Subject: [PATCH] tmpfiles: introduce type X
|
|
|
|
Type X will exclude path itself from clean-up. However, if the path is a
|
|
directory systemd-tmpfiles will clean-up its content.
|
|
|
|
In contrast to type x, where path is ignored completely, type X needs some
|
|
Age parameter. In order to determine Age parameter, we will look for config
|
|
entries of type d or D and pick the best match. Best match is either
|
|
exact match or longest prefix match.
|
|
---
|
|
man/tmpfiles.d.xml | 15 ++++
|
|
src/tmpfiles/tmpfiles.c | 192 ++++++++++++++++++++++++++++++-----------------
|
|
2 files changed, 138 insertions(+), 69 deletions(-)
|
|
|
|
Index: systemd-195/man/tmpfiles.d.xml
|
|
===================================================================
|
|
--- systemd-195.orig/man/tmpfiles.d.xml
|
|
+++ systemd-195/man/tmpfiles.d.xml
|
|
@@ -166,6 +166,21 @@ L /tmp/foobar - - - - /dev
|
|
</varlistentry>
|
|
|
|
<varlistentry>
|
|
+ <term><varname>X</varname></term>
|
|
+ <listitem><para>Ignore a path
|
|
+ during cleanup. Use this type
|
|
+ to prevent path removal as
|
|
+ controlled with the Age parameter.
|
|
+ Note that if path is a directory,
|
|
+ content of a directory is not
|
|
+ excluded from clean-up, only
|
|
+ directory itself. Lines of this
|
|
+ type accept shell-style globs
|
|
+ in place of normal path
|
|
+ names.</para></listitem>
|
|
+ </varlistentry>
|
|
+
|
|
+ <varlistentry>
|
|
<term><varname>r</varname></term>
|
|
<listitem><para>Remove a file
|
|
or directory if it
|
|
Index: systemd-195/src/tmpfiles/tmpfiles.c
|
|
===================================================================
|
|
--- systemd-195.orig/src/tmpfiles/tmpfiles.c
|
|
+++ systemd-195/src/tmpfiles/tmpfiles.c
|
|
@@ -70,6 +70,7 @@ typedef enum ItemType {
|
|
|
|
/* These ones take globs */
|
|
IGNORE_PATH = 'x',
|
|
+ IGNORE_DIRECTORY_PATH = 'X',
|
|
REMOVE_PATH = 'r',
|
|
RECURSIVE_REMOVE_PATH = 'R',
|
|
RELABEL_PATH = 'z',
|
|
@@ -119,7 +120,7 @@ static const char * const conf_file_dirs
|
|
#define MAX_DEPTH 256
|
|
|
|
static bool needs_glob(ItemType t) {
|
|
- return t == IGNORE_PATH || t == REMOVE_PATH || t == RECURSIVE_REMOVE_PATH || t == RELABEL_PATH || t == RECURSIVE_RELABEL_PATH;
|
|
+ return t == IGNORE_PATH || t == IGNORE_DIRECTORY_PATH || t == REMOVE_PATH || t == RECURSIVE_REMOVE_PATH || t == RELABEL_PATH || t == RECURSIVE_RELABEL_PATH;
|
|
}
|
|
|
|
static struct Item* find_glob(Hashmap *h, const char *match) {
|
|
@@ -218,6 +219,7 @@ static bool unix_socket_alive(const char
|
|
}
|
|
|
|
static int dir_cleanup(
|
|
+ Item *i,
|
|
const char *p,
|
|
DIR *d,
|
|
const struct stat *ds,
|
|
@@ -297,7 +299,7 @@ static int dir_cleanup(
|
|
continue;
|
|
}
|
|
|
|
- q = dir_cleanup(sub_path, sub_dir, &s, cutoff, rootdev, false, maxdepth-1, false);
|
|
+ q = dir_cleanup(i, sub_path, sub_dir, &s, cutoff, rootdev, false, maxdepth-1, false);
|
|
closedir(sub_dir);
|
|
|
|
if (q < 0)
|
|
@@ -320,12 +322,14 @@ static int dir_cleanup(
|
|
if (age >= cutoff)
|
|
continue;
|
|
|
|
- log_debug("rmdir '%s'\n", sub_path);
|
|
+ if (!i->type == IGNORE_DIRECTORY_PATH || !streq(dent->d_name, p)) {
|
|
+ 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;
|
|
+ if (unlinkat(dirfd(d), dent->d_name, AT_REMOVEDIR) < 0) {
|
|
+ if (errno != ENOENT && errno != ENOTEMPTY) {
|
|
+ log_error("rmdir(%s): %m", sub_path);
|
|
+ r = -errno;
|
|
+ }
|
|
}
|
|
}
|
|
|
|
@@ -395,68 +399,6 @@ finish:
|
|
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 (!S_ISDIR(s.st_mode)) {
|
|
- log_error("%s is not a directory.", i->path);
|
|
- r = -ENOTDIR;
|
|
- goto finish;
|
|
- }
|
|
-
|
|
- if (fstatat(dirfd(d), "..", &ps, AT_SYMLINK_NOFOLLOW) != 0) {
|
|
- log_error("stat(%s/..) failed: %m", i->path);
|
|
- r = -errno;
|
|
- goto finish;
|
|
- }
|
|
-
|
|
- 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, i->keep_first_level);
|
|
-
|
|
-finish:
|
|
- if (d)
|
|
- closedir(d);
|
|
-
|
|
- return r;
|
|
-}
|
|
-
|
|
static int item_set_perms(Item *i, const char *path) {
|
|
/* not using i->path directly because it may be a glob */
|
|
if (i->mode_set)
|
|
@@ -667,6 +609,7 @@ static int create_item(Item *i) {
|
|
switch (i->type) {
|
|
|
|
case IGNORE_PATH:
|
|
+ case IGNORE_DIRECTORY_PATH:
|
|
case REMOVE_PATH:
|
|
case RECURSIVE_REMOVE_PATH:
|
|
return 0;
|
|
@@ -850,6 +793,7 @@ static int remove_item_instance(Item *i,
|
|
case CREATE_BLOCK_DEVICE:
|
|
case CREATE_CHAR_DEVICE:
|
|
case IGNORE_PATH:
|
|
+ case IGNORE_DIRECTORY_PATH:
|
|
case RELABEL_PATH:
|
|
case RECURSIVE_RELABEL_PATH:
|
|
case WRITE_FILE:
|
|
@@ -894,6 +838,7 @@ static int remove_item(Item *i) {
|
|
case CREATE_CHAR_DEVICE:
|
|
case CREATE_BLOCK_DEVICE:
|
|
case IGNORE_PATH:
|
|
+ case IGNORE_DIRECTORY_PATH:
|
|
case RELABEL_PATH:
|
|
case RECURSIVE_RELABEL_PATH:
|
|
case WRITE_FILE:
|
|
@@ -909,6 +854,84 @@ static int remove_item(Item *i) {
|
|
return r;
|
|
}
|
|
|
|
+static int clean_item_instance(Item *i, const char* instance) {
|
|
+ DIR *d;
|
|
+ struct stat s, ps;
|
|
+ bool mountpoint;
|
|
+ int r;
|
|
+ usec_t cutoff, n;
|
|
+
|
|
+ assert(i);
|
|
+
|
|
+ if (!i->age_set)
|
|
+ return 0;
|
|
+
|
|
+ n = now(CLOCK_REALTIME);
|
|
+ if (n < i->age)
|
|
+ return 0;
|
|
+
|
|
+ cutoff = n - i->age;
|
|
+
|
|
+ d = opendir(instance);
|
|
+ if (!d) {
|
|
+ if (errno == ENOENT || errno == ENOTDIR)
|
|
+ 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 (!S_ISDIR(s.st_mode)) {
|
|
+ log_error("%s is not a directory.", i->path);
|
|
+ r = -ENOTDIR;
|
|
+ goto finish;
|
|
+ }
|
|
+
|
|
+ if (fstatat(dirfd(d), "..", &ps, AT_SYMLINK_NOFOLLOW) != 0) {
|
|
+ log_error("stat(%s/..) failed: %m", i->path);
|
|
+ r = -errno;
|
|
+ goto finish;
|
|
+ }
|
|
+
|
|
+ mountpoint = s.st_dev != ps.st_dev ||
|
|
+ (s.st_dev == ps.st_dev && s.st_ino == ps.st_ino);
|
|
+
|
|
+ r = dir_cleanup(i, instance, d, &s, cutoff, s.st_dev, mountpoint, MAX_DEPTH, i->keep_first_level);
|
|
+
|
|
+finish:
|
|
+ if (d)
|
|
+ closedir(d);
|
|
+
|
|
+ return r;
|
|
+}
|
|
+
|
|
+static int clean_item(Item *i) {
|
|
+ int r = 0;
|
|
+
|
|
+ assert(i);
|
|
+
|
|
+ switch (i->type) {
|
|
+ case CREATE_DIRECTORY:
|
|
+ case TRUNCATE_DIRECTORY:
|
|
+ case IGNORE_PATH:
|
|
+ clean_item_instance(i, i->path);
|
|
+ break;
|
|
+ case IGNORE_DIRECTORY_PATH:
|
|
+ r = glob_item(i, clean_item_instance);
|
|
+ break;
|
|
+ default:
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ return r;
|
|
+}
|
|
+
|
|
static int process_item(Item *i) {
|
|
int r, q, p;
|
|
|
|
@@ -1028,6 +1051,7 @@ static int parse_line(const char *fname,
|
|
case TRUNCATE_DIRECTORY:
|
|
case CREATE_FIFO:
|
|
case IGNORE_PATH:
|
|
+ case IGNORE_DIRECTORY_PATH:
|
|
case REMOVE_PATH:
|
|
case RECURSIVE_REMOVE_PATH:
|
|
case RELABEL_PATH:
|
|
@@ -1264,6 +1288,8 @@ static int read_config_file(const char *
|
|
FILE *f;
|
|
unsigned v = 0;
|
|
int r = 0;
|
|
+ Iterator iterator;
|
|
+ Item *i;
|
|
|
|
assert(fn);
|
|
|
|
@@ -1296,6 +1322,34 @@ static int read_config_file(const char *
|
|
r = k;
|
|
}
|
|
|
|
+ /* we have to determine age parameter for each entry of type X */
|
|
+ HASHMAP_FOREACH(i, globs, iterator) {
|
|
+ Iterator iter;
|
|
+ Item *j, *candidate_item = NULL;
|
|
+
|
|
+ if (i->type != IGNORE_DIRECTORY_PATH)
|
|
+ continue;
|
|
+
|
|
+ HASHMAP_FOREACH(j, items, iter) {
|
|
+ if (j->type != CREATE_DIRECTORY && j->type != TRUNCATE_DIRECTORY)
|
|
+ continue;
|
|
+
|
|
+ if (path_equal(j->path, i->path)) {
|
|
+ candidate_item = j;
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ if ((!candidate_item && path_startswith(i->path, j->path)) ||
|
|
+ (candidate_item && path_startswith(j->path, candidate_item->path) && (fnmatch(i->path, j->path, FNM_PATHNAME | FNM_PERIOD) == 0)))
|
|
+ candidate_item = j;
|
|
+ }
|
|
+
|
|
+ if (candidate_item) {
|
|
+ i->age = candidate_item->age;
|
|
+ i->age_set = true;
|
|
+ }
|
|
+ }
|
|
+
|
|
if (ferror(f)) {
|
|
log_error("Failed to read from file %s: %m", fn);
|
|
if (r == 0)
|
|
Index: systemd-195/tmpfiles.d/tmp.conf
|
|
===================================================================
|
|
--- systemd-195.orig/tmpfiles.d/tmp.conf
|
|
+++ systemd-195/tmpfiles.d/tmp.conf
|
|
@@ -10,3 +10,7 @@
|
|
# Clear tmp directories separately, to make them easier to override
|
|
d /tmp 1777 root root 10d
|
|
d /var/tmp 1777 root root 30d
|
|
+
|
|
+# Exclude namespace mountpoints created with PrivateTmp=yes
|
|
+X /tmp/systemd-private-*
|
|
+X /var/tmp/systemd-private-*
|
|
Index: systemd-195/man/systemd.exec.xml
|
|
===================================================================
|
|
--- systemd-195.orig/man/systemd.exec.xml
|
|
+++ systemd-195/man/systemd.exec.xml
|
|
@@ -1022,15 +1022,17 @@
|
|
<listitem><para>Takes a boolean
|
|
argument. If true sets up a new file
|
|
system namespace for the executed
|
|
- processes and mounts a private
|
|
- <filename>/tmp</filename> directory
|
|
- inside it, that is not shared by
|
|
+ processes and mounts private
|
|
+ <filename>/tmp</filename> and
|
|
+ <filename>/var/tmp</filename> directories
|
|
+ inside it, that are not shared by
|
|
processes outside of the
|
|
namespace. This is useful to secure
|
|
access to temporary files of the
|
|
process, but makes sharing between
|
|
processes via
|
|
- <filename>/tmp</filename>
|
|
+ <filename>/tmp</filename> or
|
|
+ <filename>/var/tmp</filename>
|
|
impossible. Defaults to
|
|
false.</para></listitem>
|
|
</varlistentry>
|