diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-02-16 08:25:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-16 08:25:49 +0100 |
commit | 8f50eb04acb37b8ef50f823a2917bf0a10e9ec8e (patch) | |
tree | 9896eb01d01e46ece5a2efd109b5716915141c91 /man | |
parent | 71311efe2377d7e37a6af76f110882eed2332f4e (diff) | |
parent | fa97d2fcf64e0558054bee673f734f523373b146 (diff) | |
download | systemd-8f50eb04acb37b8ef50f823a2917bf0a10e9ec8e.tar.gz |
Merge pull request #18481 from keszybz/rpm-restart-post-trans
Restart units after the rpm transaction
Diffstat (limited to 'man')
-rw-r--r-- | man/org.freedesktop.systemd1.xml | 24 | ||||
-rw-r--r-- | man/sd_bus_message_read_strv.xml | 19 | ||||
-rw-r--r-- | man/systemctl.xml | 12 |
3 files changed, 48 insertions, 7 deletions
diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml index 1d419ac495..2da0ff0579 100644 --- a/man/org.freedesktop.systemd1.xml +++ b/man/org.freedesktop.systemd1.xml @@ -176,6 +176,7 @@ node /org/freedesktop/systemd1 { UnsetEnvironment(in as names); UnsetAndSetEnvironment(in as names, in as assignments); + EnqueueMarkedJobs(out ao jobs); ListUnitFiles(out a(ss) unit_files); ListUnitFilesByPatterns(in as states, in as patterns, @@ -848,6 +849,8 @@ node /org/freedesktop/systemd1 { <variablelist class="dbus-method" generated="True" extra-ref="UnsetAndSetEnvironment()"/> + <variablelist class="dbus-method" generated="True" extra-ref="EnqueueMarkedJobs()"/> + <variablelist class="dbus-method" generated="True" extra-ref="ListUnitFiles()"/> <variablelist class="dbus-method" generated="True" extra-ref="ListUnitFilesByPatterns()"/> @@ -1171,6 +1174,11 @@ node /org/freedesktop/systemd1 { the "Try" flavor is used in which case a service that isn't running is not affected by the restart. The "ReloadOrRestart" flavors attempt a reload if the unit supports it and use a restart otherwise.</para> + <para><function>EnqueueMarkedJobs()</function> creates reload/restart jobs for units which have been + appropriately marked, see <varname>Marks</varname> property above. This is equivalent to calling + <function>TryRestartUnit()</function> or <function>ReloadOrTryRestartUnit()</function> for the marked + units.</para> + <para><function>BindMountUnit()</function> can be used to bind mount new files or directories into a running service mount namespace.</para> @@ -1685,6 +1693,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { readonly b IgnoreOnIsolate = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly b NeedDaemonReload = ...; + @org.freedesktop.DBus.Property.EmitsChangedSignal("false") + readonly as Markers = ['...', ...]; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly t JobTimeoutUSec = ...; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") @@ -1969,6 +1979,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { <variablelist class="dbus-property" generated="True" extra-ref="NeedDaemonReload"/> + <variablelist class="dbus-property" generated="True" extra-ref="Markers"/> + <variablelist class="dbus-property" generated="True" extra-ref="JobTimeoutUSec"/> <variablelist class="dbus-property" generated="True" extra-ref="JobRunningTimeoutUSec"/> @@ -2160,8 +2172,16 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { <para><varname>NeedDaemonReload</varname> is a boolean that indicates whether the configuration file this unit is loaded from (i.e. <varname>FragmentPath</varname> or <varname>SourcePath</varname>) has - changed since the configuration was read and hence whether a configuration reload is - recommended.</para> + changed since the configuration was read and hence whether a configuration reload is recommended. + </para> + + <para><varname>Markers</varname> is an array of string flags that can be set using + <function>SetUnitProperties()</function> to indicate that the service should be reloaded or + restarted. Currently known values are <literal>needs-restart</literal> and + <literal>needs-reload</literal>. Package scripts may use the first to mark units for later restart when + a new version of the package is installed. Configuration management scripts may use the second to mark + units for a later reload when the configuration is adjusted. Those flags are not set by the manager, + except to unset as appropriate when when the unit is stopped, restarted, or reloaded.</para> <para><varname>JobTimeoutUSec</varname> maps directly to the corresponding configuration setting in the unit file.</para> diff --git a/man/sd_bus_message_read_strv.xml b/man/sd_bus_message_read_strv.xml index a90ae84098..50580d86bc 100644 --- a/man/sd_bus_message_read_strv.xml +++ b/man/sd_bus_message_read_strv.xml @@ -36,11 +36,13 @@ <refsect1> <title>Description</title> - <para><function>sd_bus_message_read_strv()</function> gives access to an array of strings in message - <parameter>m</parameter>. The "read pointer" in the message must be right before an array of strings. On - success, a pointer to the <constant>NULL</constant>-terminated array of strings is returned in the output - parameter <parameter>l</parameter>. Note that ownership of this array is transferred to the caller. - Hence, the caller is responsible for freeing this array and its contents.</para> + <para><function>sd_bus_message_read_strv()</function> gives access to an array of string-like items in + message <parameter>m</parameter>. The "read pointer" in the message must be right before an array of + strings (D-Bus type <literal>as</literal>), object paths (D-Bus type <literal>ao</literal>), or + signatures (D-Bus type <literal>ag</literal>). On success, a pointer to a + <constant>NULL</constant>-terminated array of strings is returned in the output parameter + <parameter>l</parameter>. Note that ownership of this array is transferred to the caller. Hence, the + caller is responsible for freeing this array and its contents.</para> </refsect1> <refsect1> @@ -73,6 +75,13 @@ <listitem><para>The message cannot be parsed.</para></listitem> </varlistentry> + + <varlistentry> + <term><constant>-ENXIO</constant></term> + + <listitem><para>The message "read pointer" is not right before an array of the appropriate type. + </para></listitem> + </varlistentry> </variablelist> </refsect2> </refsect1> diff --git a/man/systemctl.xml b/man/systemctl.xml index 2ed58eb33b..be414ebb1e 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -2305,6 +2305,18 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err </varlistentry> <varlistentry> + <term><option>--marked</option></term> + + <listitem><para>Only allowed with <command>reload-or-restart</command>. Enqueues restart jobs for all + units that have the <literal>needs-restart</literal> mark, and reload jobs for units that have the + <literal>needs-reload</literal> mark. When a unit marked for reload does not support reload, restart + will be queued. Those properties can be set using <command>set-property Marks</command>.</para> + + <para>Unless <option>--no-block</option> is used, <command>systemctl</command> will wait for the + queued jobs to finish.</para></listitem> + </varlistentry> + + <varlistentry> <term><option>--read-only</option></term> <listitem><para>When used with <command>bind</command>, creates a read-only bind mount.</para></listitem> |