diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-09-30 14:37:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-30 14:37:24 +0200 |
| commit | 626fb9f30195f2b6b25bb1e778096c6e2348ad83 (patch) | |
| tree | 6e070c90f4012cc9c6a758f13327bb08828a5170 /man | |
| parent | Merge pull request #17195 from keszybz/man-cleanups (diff) | |
| parent | resolvectl: show resolv.conf mode in resolvectl output (diff) | |
| download | systemd-626fb9f30195f2b6b25bb1e778096c6e2348ad83.tar.xz systemd-626fb9f30195f2b6b25bb1e778096c6e2348ad83.zip | |
Merge pull request #17203 from poettering/resolv-conf-mode
expose resolv.conf mode bus property
Diffstat (limited to 'man')
| -rw-r--r-- | man/org.freedesktop.resolve1.xml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/man/org.freedesktop.resolve1.xml b/man/org.freedesktop.resolve1.xml index 5b8acbbd9f..6a6d9de6b9 100644 --- a/man/org.freedesktop.resolve1.xml +++ b/man/org.freedesktop.resolve1.xml @@ -147,6 +147,8 @@ node /org/freedesktop/resolve1 { readonly as DNSSECNegativeTrustAnchors = ['...', ...]; @org.freedesktop.DBus.Property.EmitsChangedSignal("false") readonly s DNSStubListener = '...'; + @org.freedesktop.DBus.Property.EmitsChangedSignal("false") + readonly s ResolvConfMode = '...'; }; interface org.freedesktop.DBus.Peer { ... }; interface org.freedesktop.DBus.Introspectable { ... }; @@ -272,6 +274,8 @@ node /org/freedesktop/resolve1 { <variablelist class="dbus-property" generated="True" extra-ref="DNSStubListener"/> + <variablelist class="dbus-property" generated="True" extra-ref="ResolvConfMode"/> + <!--End of Autogenerated section--> <refsect2> @@ -555,9 +559,12 @@ node /org/freedesktop/resolve1 { DNSSEC is supported by DNS servers until it verifies that this is not the case. Thus, the reported value may initially be true, until the first transactions are executed.</para> - <para>The <varname>LogLevel</varname> property shows the (maximum) log level of the manager, with the - same values as the <option>--log-level=</option> option described in - <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para> + <para>The <varname>ResolvConfMode</varname> property exposes how <filename>/etc/resolv.conf</filename> + is managed on the host. Currently, the values <literal>uplink</literal>, <literal>stub</literal>, + <literal>static</literal> (these three correspond to the three different files + <filename>systemd-resolved.service</filename> provides), <literal>foreign</literal> (the file is + managed by admin or another service, <filename>systemd-resolved.service</filename> just consumes it), + <literal>missing</literal> (<filename>/etc/resolv.conf</filename> is missing).</para> </refsect2> </refsect1> |