[systemd-commits] 2 commits - man/systemd-delta.xml src/delta
Zbigniew Jędrzejewski-Szmek
zbyszek at kemper.freedesktop.org
Sun Dec 22 19:55:53 PST 2013
man/systemd-delta.xml | 80 ++++++++++++++---
src/delta/delta.c | 227 +++++++++++++++++++++++++-------------------------
2 files changed, 179 insertions(+), 128 deletions(-)
New commits:
commit 6096dfd6167f8520be3a359c1fd0e6f2e76a4dc1
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Sun Dec 22 22:53:23 2013 -0500
delta: if prefix is specified, only show overrides there
systemd-delta /run/systemd/system will show all unit overrides
in /run, etc.
diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml
index 413ebd8..4d3ab78 100644
--- a/man/systemd-delta.xml
+++ b/man/systemd-delta.xml
@@ -49,7 +49,9 @@
<refsynopsisdiv>
<cmdsynopsis>
- <command>systemd-delta <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt" rep="repeat">SUFFIX</arg></command>
+ <command>systemd-delta</command>
+ <arg choice="opt" rep="repeat">OPTIONS</arg>
+ <arg choice="opt" rep="repeat"><replaceable>PREFIX</replaceable><optional>/<replaceable>SUFFIX</replaceable></optional>|<replaceable>SUFFIX</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -57,18 +59,46 @@
<title>Description</title>
<para><command>systemd-delta</command> may be used to
- identify and compare configuration files in
- <filename>/etc</filename> that override default
- counterparts in <filename>/usr</filename>. The command
- line argument can be one or more name of a subdirectories of
- <filename>/etc</filename> or
- <filename>/usr/lib</filename> to compare, such as
- <filename>tmpfiles.d</filename>, <filename>sysctl.d</filename> or
- <filename>systemd/system</filename>.</para>
-
- <para>When no argument is specified a number of
- well-known subdirectories are searched for overridden
- files.</para>
+ identify and compare configuration files that override
+ other configuration files. Files in
+ <filename>/etc</filename> have highest priority, files
+ in <filename>/run</filename> have the second highest
+ priority, ..., files in <filename>/lib</filename> have
+ lowest priority. Files in a directory with higher
+ priority override files with the same name in
+ directories of lower priority. In addition, certain
+ configuration files can have <literal>.d</literal>
+ directories which contain "drop-in" files with
+ configuration snippets which augment the main
+ configuration file. "Drop-in" files can be overriden
+ in the same way by placing files with the same name in
+ a directory of higher priority (except that in case of
+ "drop-in" files, both the "drop-in" file name and the
+ name of the containing directory, which corresponds to
+ the name of the main configuration file, must match).
+ For a fuller explanation, see
+ <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+ </para>
+
+ <para>The command line argument will be split into a
+ prefix and a suffix. Either is optional. The prefix
+ must be one of the directories containing
+ configuration files (<filename>/etc</filename>,
+ <filename>/run</filename>,
+ <filename>/usr/lib</filename>, ...). If it is given,
+ only overriding files contained in this directory will
+ be shown. Otherwise, all overriding files will be
+ shown. The suffix must be a name of a subdirectory
+ containing configuration files like
+ <filename>tmpfiles.d</filename>,
+ <filename>sysctl.d</filename> or
+ <filename>systemd/system</filename>. If it is given,
+ only configuration files in this subdirectory (across
+ all configuration paths) will be analyzed. Otherwise,
+ all configuration files will be analyzed. If the
+ commandline argument is not given at all, all
+ configuration files will be analyzed. See below for
+ some examples.</para>
</refsect1>
<refsect1>
@@ -168,9 +198,28 @@
</varlistentry>
</variablelist>
-
</refsect1>
+ <refsect1>
+ <title>Examples</title>
+
+ <para>To see all local configuration:</para>
+ <programlisting>systemd-delta
+ </programlisting>
+
+ <para>To see all runtime configuration:</para>
+ <programlisting>systemd-delta /run
+ </programlisting>
+
+ <para>To see all system unit configuration changes:</para>
+ <programlisting>systemd-delta systemd/system
+ </programlisting>
+
+ <para>To see all runtime "drop-in" changes for system units:</para>
+ <programlisting>systemd-delta --type=extended /run/systemd/system
+ </programlisting>
+ </refsect1>
+
<refsect1>
<title>Exit status</title>
@@ -181,7 +230,8 @@
<refsect1>
<title>See Also</title>
<para>
- <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>
</para>
</refsect1>
diff --git a/src/delta/delta.c b/src/delta/delta.c
index f049eb2..19eaed3 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -4,6 +4,7 @@
This file is part of systemd.
Copyright 2012 Lennart Poettering
+ Copyright 2013 Zbigniew Jędrzejewski-Szmek
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
@@ -346,7 +347,7 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch
}
}
-static int process_suffix(const char *suffix) {
+static int process_suffix(const char *suffix, const char *onlyprefix) {
const char *p;
char *f;
Hashmap *top, *bottom, *drops;
@@ -391,20 +392,23 @@ static int process_suffix(const char *suffix) {
o = hashmap_get(bottom, key);
assert(o);
- if (path_equal(o, f))
- notify_override_unchanged(f);
- else {
- k = found_override(f, o);
- if (k < 0)
- r = k;
- else
- n_found += k;
+ if (!onlyprefix || startswith(o, onlyprefix)) {
+ if (path_equal(o, f)) {
+ notify_override_unchanged(f);
+ } else {
+ k = found_override(f, o);
+ if (k < 0)
+ r = k;
+ else
+ n_found += k;
+ }
}
h = hashmap_get(drops, key);
if (h)
HASHMAP_FOREACH(o, h, j)
- n_found += notify_override_extended(f, o);
+ if (!onlyprefix || startswith(o, onlyprefix))
+ n_found += notify_override_extended(f, o);
}
finish:
@@ -423,24 +427,41 @@ finish:
return r < 0 ? r : n_found;
}
-static int process_suffix_chop(const char *suffix) {
+static int process_suffixes(const char *onlyprefix) {
+ const char *n;
+ int n_found = 0, r;
+
+ NULSTR_FOREACH(n, suffixes) {
+ r = process_suffix(n, onlyprefix);
+ if (r < 0)
+ return r;
+ else
+ n_found += r;
+ }
+ return n_found;
+}
+
+static int process_suffix_chop(const char *arg) {
const char *p;
- assert(suffix);
+ assert(arg);
- if (!path_is_absolute(suffix))
- return process_suffix(suffix);
+ if (!path_is_absolute(arg))
+ return process_suffix(arg, NULL);
/* Strip prefix from the suffix */
NULSTR_FOREACH(p, prefixes) {
- if (startswith(suffix, p)) {
- suffix += strlen(p);
+ const char *suffix = startswith(arg, p);
+ if (suffix) {
suffix += strspn(suffix, "/");
- return process_suffix(suffix);
+ if (*suffix)
+ return process_suffix(suffix, NULL);
+ else
+ return process_suffixes(arg);
}
}
- log_error("Invalid suffix specification %s.", suffix);
+ log_error("Invalid suffix specification %s.", arg);
return -EINVAL;
}
@@ -595,15 +616,11 @@ int main(int argc, char *argv[]) {
}
} else {
- const char *n;
-
- NULSTR_FOREACH(n, suffixes) {
- k = process_suffix(n);
- if (k < 0)
- r = k;
- else
- n_found += k;
- }
+ k = process_suffixes(NULL);
+ if (k < 0)
+ r = k;
+ else
+ n_found += k;
}
if (r >= 0)
commit f939e9a47c54ac37504e8517f316cbec46864d14
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Sun Dec 22 19:45:02 2013 -0500
delta: fix delta for drop-ins
Also, fix highlighting, add more debug statements, make const tables
static and global, run path_kill_slashes only at entry.
diff --git a/src/delta/delta.c b/src/delta/delta.c
index a26af02..f049eb2 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -33,6 +33,34 @@
#include "build.h"
#include "strv.h"
+static const char prefixes[] =
+ "/etc\0"
+ "/run\0"
+ "/usr/local/lib\0"
+ "/usr/local/share\0"
+ "/usr/lib\0"
+ "/usr/share\0"
+#ifdef HAVE_SPLIT_USR
+ "/lib\0"
+#endif
+ ;
+
+static const char suffixes[] =
+ "sysctl.d\0"
+ "tmpfiles.d\0"
+ "modules-load.d\0"
+ "binfmt.d\0"
+ "systemd/system\0"
+ "systemd/user\0"
+ "systemd/system-preset\0"
+ "systemd/user-preset\0"
+ "udev/rules.d\0"
+ "modprobe.d\0";
+
+static const char have_dropins[] =
+ "systemd/system\0"
+ "systemd/user\0";
+
static bool arg_no_pager = false;
static int arg_diff = -1;
@@ -48,6 +76,14 @@ static enum {
(SHOW_MASKED | SHOW_EQUIVALENT | SHOW_REDIRECTED | SHOW_OVERRIDDEN | SHOW_EXTENDED)
} arg_flags = 0;
+static void pager_open_if_enabled(void) {
+
+ if (arg_no_pager)
+ return;
+
+ pager_open(false);
+}
+
static int equivalent(const char *a, const char *b) {
_cleanup_free_ char *x = NULL, *y = NULL;
@@ -76,7 +112,7 @@ static int notify_override_equivalent(const char *top, const char *bottom) {
return 0;
printf("%s%s%s %s → %s\n",
- ansi_highlight_green(), "[EQUIVALENT]", ansi_highlight(), top, bottom);
+ ansi_highlight_green(), "[EQUIVALENT]", ansi_highlight_off(), top, bottom);
return 1;
}
@@ -160,24 +196,26 @@ static int found_override(const char *top, const char *bottom) {
}
static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const char *toppath, const char *drop) {
- _cleanup_free_ char *conf = NULL;
+ _cleanup_free_ char *unit = NULL;
_cleanup_free_ char *path = NULL;
_cleanup_strv_free_ char **list = NULL;
char **file;
char *c;
int r;
+ assert(!endswith(drop, "/"));
+
path = strjoin(toppath, "/", drop, NULL);
if (!path)
return -ENOMEM;
- path_kill_slashes(path);
+ log_debug("Looking at %s", path);
- conf = strdup(drop);
- if (!conf)
+ unit = strdup(drop);
+ if (!unit)
return -ENOMEM;
- c = strrchr(conf, '.');
+ c = strrchr(unit, '.');
if (!c)
return -EINVAL;
*c = 0;
@@ -200,35 +238,21 @@ static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const
p = strjoin(path, "/", *file, NULL);
if (!p)
return -ENOMEM;
+ d = p + strlen(toppath) + 1;
- path_kill_slashes(p);
-
- d = strrchr(p, '/');
- if (!d || d == p) {
- free(p);
- return -EINVAL;
- }
- d--;
- d = strrchr(p, '/');
-
- if (!d || d == p) {
- free(p);
- return -EINVAL;
- }
-
+ log_debug("Adding at top: %s → %s", d, p);
k = hashmap_put(top, d, p);
if (k >= 0) {
p = strdup(p);
if (!p)
return -ENOMEM;
- d = strrchr(p, '/');
- d--;
- d = strrchr(p, '/');
+ d = p + strlen(toppath) + 1;
} else if (k != -EEXIST) {
free(p);
return k;
}
+ log_debug("Adding at bottom: %s → %s", d, p);
free(hashmap_remove(bottom, d));
k = hashmap_put(bottom, d, p);
if (k < 0) {
@@ -236,14 +260,14 @@ static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const
return k;
}
- h = hashmap_get(drops, conf);
+ h = hashmap_get(drops, unit);
if (!h) {
h = hashmap_new(string_hash_func, string_compare_func);
if (!h)
return -ENOMEM;
- hashmap_put(drops, conf, h);
- conf = strdup(conf);
- if (!conf)
+ hashmap_put(drops, unit, h);
+ unit = strdup(unit);
+ if (!unit)
return -ENOMEM;
}
@@ -251,6 +275,7 @@ static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const
if (!p)
return -ENOMEM;
+ log_debug("Adding to drops: %s → %s → %s", unit, basename(p), p);
k = hashmap_put(h, basename(p), p);
if (k < 0) {
free(p);
@@ -269,12 +294,14 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch
assert(drops);
assert(path);
+ log_debug("Looking at %s", path);
+
d = opendir(path);
if (!d) {
if (errno == ENOENT)
return 0;
- log_error("Failed to enumerate %s: %m", path);
+ log_error("Failed to open %s: %m", path);
return -errno;
}
@@ -285,11 +312,8 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch
errno = 0;
de = readdir(d);
- if (!de && errno != 0)
- return -errno;
-
if (!de)
- break;
+ return -errno;
if (dropins && de->d_type == DT_DIR && endswith(de->d_name, ".d"))
enumerate_dir_d(top, bottom, drops, path, de->d_name);
@@ -301,8 +325,7 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch
if (!p)
return -ENOMEM;
- path_kill_slashes(p);
-
+ log_debug("Adding at top: %s → %s", basename(p), p);
k = hashmap_put(top, basename(p), p);
if (k >= 0) {
p = strdup(p);
@@ -313,6 +336,7 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch
return k;
}
+ log_debug("Adding at bottom: %s → %s", basename(p), p);
free(hashmap_remove(bottom, basename(p)));
k = hashmap_put(bottom, basename(p), p);
if (k < 0) {
@@ -320,37 +344,29 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch
return k;
}
}
-
- return 0;
}
-static int process_suffix(const char *prefixes, const char *suffix, bool dropins) {
+static int process_suffix(const char *suffix) {
const char *p;
char *f;
- Hashmap *top, *bottom=NULL, *drops=NULL;
+ Hashmap *top, *bottom, *drops;
Hashmap *h;
char *key;
int r = 0, k;
Iterator i, j;
int n_found = 0;
+ bool dropins;
- assert(prefixes);
assert(suffix);
+ assert(!startswith(suffix, "/"));
+ assert(!strstr(suffix, "//"));
- top = hashmap_new(string_hash_func, string_compare_func);
- if (!top) {
- r = -ENOMEM;
- goto finish;
- }
+ dropins = nulstr_contains(have_dropins, suffix);
+ top = hashmap_new(string_hash_func, string_compare_func);
bottom = hashmap_new(string_hash_func, string_compare_func);
- if (!bottom) {
- r = -ENOMEM;
- goto finish;
- }
-
drops = hashmap_new(string_hash_func, string_compare_func);
- if (!drops) {
+ if (!top || !bottom || !drops) {
r = -ENOMEM;
goto finish;
}
@@ -365,10 +381,8 @@ static int process_suffix(const char *prefixes, const char *suffix, bool dropins
}
k = enumerate_dir(top, bottom, drops, t, dropins);
- if (k < 0)
+ if (r == 0)
r = k;
-
- log_debug("Looking at %s", t);
}
HASHMAP_FOREACH_KEY(f, key, top, i) {
@@ -409,21 +423,20 @@ finish:
return r < 0 ? r : n_found;
}
-static int process_suffix_chop(const char *prefixes, const char *suffix, const char *have_dropins) {
+static int process_suffix_chop(const char *suffix) {
const char *p;
- assert(prefixes);
assert(suffix);
if (!path_is_absolute(suffix))
- return process_suffix(prefixes, suffix, nulstr_contains(have_dropins, suffix));
+ return process_suffix(suffix);
/* Strip prefix from the suffix */
NULSTR_FOREACH(p, prefixes) {
if (startswith(suffix, p)) {
suffix += strlen(p);
suffix += strspn(suffix, "/");
- return process_suffix(prefixes, suffix, nulstr_contains(have_dropins, suffix));
+ return process_suffix(suffix);
}
}
@@ -549,35 +562,6 @@ static int parse_argv(int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {
-
- const char prefixes[] =
- "/etc\0"
- "/run\0"
- "/usr/local/lib\0"
- "/usr/local/share\0"
- "/usr/lib\0"
- "/usr/share\0"
-#ifdef HAVE_SPLIT_USR
- "/lib\0"
-#endif
- ;
-
- const char suffixes[] =
- "sysctl.d\0"
- "tmpfiles.d\0"
- "modules-load.d\0"
- "binfmt.d\0"
- "systemd/system\0"
- "systemd/user\0"
- "systemd/system-preset\0"
- "systemd/user-preset\0"
- "udev/rules.d\0"
- "modprobe.d\0";
-
- const char have_dropins[] =
- "systemd/system\0"
- "systemd/user\0";
-
int r = 0, k;
int n_found = 0;
@@ -596,14 +580,14 @@ int main(int argc, char *argv[]) {
else if (arg_diff)
arg_flags |= SHOW_OVERRIDDEN;
- if (!arg_no_pager)
- pager_open(false);
+ pager_open_if_enabled();
if (optind < argc) {
int i;
for (i = optind; i < argc; i++) {
- k = process_suffix_chop(prefixes, argv[i], have_dropins);
+ path_kill_slashes(argv[i]);
+ k = process_suffix_chop(argv[i]);
if (k < 0)
r = k;
else
@@ -614,7 +598,7 @@ int main(int argc, char *argv[]) {
const char *n;
NULSTR_FOREACH(n, suffixes) {
- k = process_suffix(prefixes, n, nulstr_contains(have_dropins, n));
+ k = process_suffix(n);
if (k < 0)
r = k;
else
More information about the systemd-commits
mailing list