shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-22 06:50:18 +03:00
Code

Merge pull request #13353 from keszybz/analyze-cat-config-relabel-extra.d

Browse Source 
systemd-analyze cat-config relabel-extra.d/
This commit is contained in:
Lennart Poettering 2019-08-19 15:38:00 +02:00 committed by GitHub
commit 344edf1056
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
man/systemd-nspawn.xml
View File

@ -713,10 +713,10 @@
<varlistentry>
<term><option>--private-users-chown</option></term>
<listitem><para>If specified, all files and directories in the container's directory tree will adjusted so that
they are owned to the appropriate UIDs/GIDs selected for the container (see above). This operation is
potentially expensive, as it involves descending and iterating through the full directory tree of the
container. Besides actual file ownership, file ACLs are adjusted as well.</para>
<listitem><para>If specified, all files and directories in the container's directory tree will be
adjusted so that they are owned by the appropriate UIDs/GIDs selected for the container (see above).
This operation is potentially expensive, as it involves iterating through the full directory tree of
the container. Besides actual file ownership, file ACLs are adjusted as well.</para>
<para>This option is implied if <option>--private-users=pick</option> is used. This option has no effect if
user namespacing is not used.</para></listitem>

27
src/shared/pretty-print.c
View File

@ -213,13 +213,17 @@ void print_separator(void) {
fputs("\n\n", stdout);
}
static int guess_type(const char **name, bool *is_usr, bool *is_collection, const char **extension) {
static int guess_type(const char **name, char ***prefixes, bool *is_collection, const char **extension) {
/* Try to figure out if name is like tmpfiles.d/ or systemd/system-presets/,
* i.e. a collection of directories without a main config file. */
_cleanup_free_ char *n = NULL;
bool usr = false, coll = false;
bool usr = false, run = false, coll = false;
const char *ext = ".conf";
/* This is static so that the array doesn't get deallocated when we exit the function */
static const char* const std_prefixes[] = { CONF_PATHS(""), NULL };
static const char* const usr_prefixes[] = { CONF_PATHS_USR(""), NULL };
static const char* const run_prefixes[] = { "/run/", NULL };
if (path_equal(*name, "environment.d"))
/* Special case: we need to include /etc/environment in the search path, even
@ -252,6 +256,11 @@ static int guess_type(const char **name, bool *is_usr, bool *is_collection, cons
ext = ".list";
}
if (path_equal(n, "systemd/relabel-extra.d")) {
coll = run = true;
ext = ".relabel";
}
if (PATH_IN_SET(n, "systemd/system-preset", "systemd/user-preset")) {
coll = true;
ext = ".preset";
@ -260,7 +269,7 @@ static int guess_type(const char **name, bool *is_usr, bool *is_collection, cons
if (path_equal(n, "systemd/user-preset"))
usr = true;
*is_usr = usr;
*prefixes = (char**) (usr ? usr_prefixes : run ? run_prefixes : std_prefixes);
*is_collection = coll;
*extension = ext;
return 0;
@ -269,19 +278,19 @@ static int guess_type(const char **name, bool *is_usr, bool *is_collection, cons
int conf_files_cat(const char *root, const char *name) {
_cleanup_strv_free_ char **dirs = NULL, **files = NULL;
_cleanup_free_ char *path = NULL;
char **dir;
bool is_usr, is_collection;
char **prefixes, **prefix;
bool is_collection;
const char *extension;
char **t;
int r;
r = guess_type(&name, &is_usr, &is_collection, &extension);
r = guess_type(&name, &prefixes, &is_collection, &extension);
if (r < 0)
return r;
STRV_FOREACH(dir, is_usr ? CONF_PATHS_USR_STRV("") : CONF_PATHS_STRV("")) {
assert(endswith(*dir, "/"));
r = strv_extendf(&dirs, "%s%s%s", *dir, name,
STRV_FOREACH(prefix, prefixes) {
assert(endswith(*prefix, "/"));
r = strv_extendf(&dirs, "%s%s%s", *prefix, name,
is_collection ? "" : ".d");
if (r < 0)
return log_error_errno(r, "Failed to build directory list: %m");

2
src/systemctl/systemctl.c
View File

@ -5874,7 +5874,7 @@ static int cat(int argc, char *argv[], void *userdata) {
bool first = true;
int r;
/* Include all units by default - i.e. continue as if the --all
/* Include all units by default — i.e. continue as if the --all
* option was used */
if (strv_isempty(arg_states))
arg_all = true;