mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-24 02:33:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

tmpfiles: support passing --prefix multiple times

Browse Source
This commit is contained in:
Dave Reisner 2013-07-24 11:10:05 -04:00
parent 15a722007d
commit a2aced4add
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
man/systemd-tmpfiles.xml
View File

@ -121,7 +121,8 @@
<term><option>--prefix=PATH</option></term> <term><option>--prefix=PATH</option></term>
<listitem><para>Only apply rules that <listitem><para>Only apply rules that
apply to paths with the specified apply to paths with the specified
prefix.</para></listitem> prefix. This option can be specified
multiple times.</para></listitem>
</varlistentry> </varlistentry>

24
src/tmpfiles/tmpfiles.c
View File

@ -105,7 +105,7 @@ static bool arg_create = false;
static bool arg_clean = false; static bool arg_clean = false;
static bool arg_remove = false; static bool arg_remove = false;
static const char *arg_prefix = NULL; static char **include_prefixes = NULL;
static const char conf_file_dirs[] = static const char conf_file_dirs[] =
"/etc/tmpfiles.d\0" "/etc/tmpfiles.d\0"
@ -1018,6 +1018,21 @@ static bool item_equal(Item *a, Item *b) {
return true; return true;
} }
static bool should_include_path(const char *path) {
char **prefix;
/* no explicit paths specified for inclusion, so everything is valid */
if (strv_length(include_prefixes) == 0)
return true;
STRV_FOREACH(prefix, include_prefixes) {
if (path_startswith(path, *prefix))
return true;
}
return false;
}
static int parse_line(const char *fname, unsigned line, const char *buffer) { static int parse_line(const char *fname, unsigned line, const char *buffer) {
_cleanup_item_free_ Item *i = NULL; _cleanup_item_free_ Item *i = NULL;
Item *existing; Item *existing;
@ -1119,7 +1134,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
path_kill_slashes(i->path); path_kill_slashes(i->path);
if (arg_prefix && !path_startswith(i->path, arg_prefix)) if (!should_include_path(i->path))
return 0; return 0;
if (user && !streq(user, "-")) { if (user && !streq(user, "-")) {
@ -1258,7 +1273,8 @@ static int parse_argv(int argc, char *argv[]) {
break; break;
case ARG_PREFIX: case ARG_PREFIX:
arg_prefix = optarg; if (strv_extend(&include_prefixes, optarg) < 0)
return log_oom();
break; break;
case '?': case '?':
@ -1423,6 +1439,8 @@ finish:
hashmap_free(items); hashmap_free(items);
hashmap_free(globs); hashmap_free(globs);
strv_free(include_prefixes);
set_free_free(unix_sockets); set_free_free(unix_sockets);
label_finish(); label_finish();