service: mark compat options as such
This moves FsckPassNo= and SysVStartPriority= into its own "Compatibility Options" section in the man page to clarify that these options are not useful for anything but establishing a limited amount of compatibility. Also stop exposing these options on the bus.
This commit is contained in:
Lennart Poettering
parent
6de0e0e500
commit
c485d3ba09
|
|
@ -258,6 +258,18 @@
|
|||
</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
</variablelist>
|
||||
</refsect1>
|
||||
|
||||
<refsect1>
|
||||
<title>Compatibility Options</title>
|
||||
|
||||
<para>The following option is also available in the
|
||||
<literal>[Mount]</literal> section, but exists purely
|
||||
for compatibility reasons and should not be used in
|
||||
newly written mount files.</para>
|
||||
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term><varname>FsckPassNo=</varname></term>
|
||||
|
||||
|
|
@ -268,7 +280,6 @@
|
|||
for more information on this setting.
|
||||
</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
</variablelist>
|
||||
</refsect1>
|
||||
|
||||
|
|
|
|||
|
|
@ -586,29 +586,6 @@
|
|||
false.</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><varname>SysVStartPriority=</varname></term>
|
||||
<listitem><para>Set the SysV start
|
||||
priority to use to order this service
|
||||
in relation to SysV services lacking
|
||||
LSB headers. This option is only
|
||||
necessary to fix ordering in relation
|
||||
to legacy SysV services, that have no
|
||||
ordering information encoded in the
|
||||
script headers. As such it should only
|
||||
be used as temporary compatibility
|
||||
option, and not be used in new unit
|
||||
files. Almost always it is a better
|
||||
choice to add explicit ordering
|
||||
directives via
|
||||
<varname>After=</varname> or
|
||||
<varname>Before=</varname>,
|
||||
instead. For more details see
|
||||
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>. If
|
||||
used, pass an integer value in the
|
||||
range 0-99.</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><varname>KillMode=</varname></term>
|
||||
<listitem><para>Specifies how
|
||||
|
|
@ -748,33 +725,6 @@
|
|||
refers to.</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><varname>FsckPassNo=</varname></term>
|
||||
<listitem><para>Set the fsck passno
|
||||
priority to use to order this service
|
||||
in relation to other file system
|
||||
checking services. This option is only
|
||||
necessary to fix ordering in relation
|
||||
to fsck jobs automatically created for
|
||||
all <filename>/etc/fstab</filename>
|
||||
entries with a value in the fs_passno
|
||||
column > 0. As such it should only be
|
||||
used as option for fsck
|
||||
services. Almost always it is a better
|
||||
choice to add explicit ordering
|
||||
directives via
|
||||
<varname>After=</varname> or
|
||||
<varname>Before=</varname>,
|
||||
instead. For more details see
|
||||
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>. If
|
||||
used, pass an integer value in the
|
||||
same range as
|
||||
<filename>/etc/fstab</filename>'s
|
||||
fs_passno column. See
|
||||
<citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
|
||||
for details.</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><varname>StartLimitInterval=</varname></term>
|
||||
<term><varname>StartLimitBurst=</varname></term>
|
||||
|
|
@ -838,6 +788,68 @@
|
|||
</variablelist>
|
||||
</refsect1>
|
||||
|
||||
<refsect1>
|
||||
<title>Compatibility Options</title>
|
||||
|
||||
<para>The following options are also available in the
|
||||
<literal>[Service]</literal> section, but exist purely
|
||||
for compatibility reasons and should not be used in
|
||||
newly written service files.</para>
|
||||
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term><varname>SysVStartPriority=</varname></term>
|
||||
<listitem><para>Set the SysV start
|
||||
priority to use to order this service
|
||||
in relation to SysV services lacking
|
||||
LSB headers. This option is only
|
||||
necessary to fix ordering in relation
|
||||
to legacy SysV services, that have no
|
||||
ordering information encoded in the
|
||||
script headers. As such it should only
|
||||
be used as temporary compatibility
|
||||
option, and not be used in new unit
|
||||
files. Almost always it is a better
|
||||
choice to add explicit ordering
|
||||
directives via
|
||||
<varname>After=</varname> or
|
||||
<varname>Before=</varname>,
|
||||
instead. For more details see
|
||||
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>. If
|
||||
used, pass an integer value in the
|
||||
range 0-99.</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><varname>FsckPassNo=</varname></term>
|
||||
<listitem><para>Set the fsck passno
|
||||
priority to use to order this service
|
||||
in relation to other file system
|
||||
checking services. This option is only
|
||||
necessary to fix ordering in relation
|
||||
to fsck jobs automatically created for
|
||||
all <filename>/etc/fstab</filename>
|
||||
entries with a value in the fs_passno
|
||||
column > 0. As such it should only be
|
||||
used as option for fsck
|
||||
services. Almost always it is a better
|
||||
choice to add explicit ordering
|
||||
directives via
|
||||
<varname>After=</varname> or
|
||||
<varname>Before=</varname>,
|
||||
instead. For more details see
|
||||
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>. If
|
||||
used, pass an integer value in the
|
||||
same range as
|
||||
<filename>/etc/fstab</filename>'s
|
||||
fs_passno column. See
|
||||
<citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
|
||||
for details.</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
</variablelist>
|
||||
</refsect1>
|
||||
|
||||
<refsect1>
|
||||
<title>See Also</title>
|
||||
<para>
|
||||
|
|
|
|||
|
|
@ -26,14 +26,6 @@
|
|||
#include "dbus-service.h"
|
||||
#include "dbus-common.h"
|
||||
|
||||
#ifdef HAVE_SYSV_COMPAT
|
||||
#define BUS_SERVICE_SYSV_INTERFACE_FRAGMENT \
|
||||
" <property name=\"SysVStartPriority\" type=\"i\" access=\"read\"/>\n" \
|
||||
" <property name=\"SysVRunLevels\" type=\"s\" access=\"read\"/>\n"
|
||||
#else
|
||||
#define BUS_SERVICE_SYSV_INTERFACE_FRAGMENT ""
|
||||
#endif
|
||||
|
||||
#define BUS_SERVICE_INTERFACE \
|
||||
" <interface name=\"org.freedesktop.systemd1.Service\">\n" \
|
||||
" <property name=\"Type\" type=\"s\" access=\"read\"/>\n" \
|
||||
|
|
@ -63,9 +55,7 @@
|
|||
" <property name=\"ControlPID\" type=\"u\" access=\"read\"/>\n" \
|
||||
" <property name=\"BusName\" type=\"s\" access=\"read\"/>\n" \
|
||||
" <property name=\"StatusText\" type=\"s\" access=\"read\"/>\n" \
|
||||
" <property name=\"FsckPassNo\" type=\"i\" access=\"read\"/>\n" \
|
||||
" <property name=\"Result\" type=\"s\" access=\"read\"/>\n" \
|
||||
BUS_SERVICE_SYSV_INTERFACE_FRAGMENT \
|
||||
" </interface>\n"
|
||||
|
||||
#define INTROSPECTION \
|
||||
|
|
@ -144,11 +134,6 @@ static const BusProperty bus_service_properties[] = {
|
|||
{ "ControlPID", bus_property_append_pid, "u", offsetof(Service, control_pid) },
|
||||
{ "BusName", bus_property_append_string, "s", offsetof(Service, bus_name), true },
|
||||
{ "StatusText", bus_property_append_string, "s", offsetof(Service, status_text), true },
|
||||
#ifdef HAVE_SYSV_COMPAT
|
||||
{ "SysVRunLevels", bus_property_append_string, "s", offsetof(Service, sysv_runlevels), true },
|
||||
{ "SysVStartPriority", bus_property_append_int, "i", offsetof(Service, sysv_start_priority) },
|
||||
#endif
|
||||
{ "FsckPassNo", bus_property_append_int, "i", offsetof(Service, fsck_passno) },
|
||||
{ "Result", bus_service_append_service_result,"s", offsetof(Service, result) },
|
||||
{ NULL, }
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue