mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-22 13:33:56 +03:00
core: warn and ignore SysVStartPriority=
Option was being parsed but not used for anything.
This commit is contained in:
parent
a2c0e528b8
commit
9e37c9544b
@ -1130,40 +1130,6 @@
|
||||
|
||||
</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 class='unit-directives'>
|
||||
<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 a temporary compatibility
|
||||
option and should 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>
|
||||
</variablelist>
|
||||
</refsect1>
|
||||
|
||||
<refsect1>
|
||||
<title>Command lines</title>
|
||||
|
||||
|
@ -223,9 +223,7 @@ Service.GuessMainPID, config_parse_bool, 0,
|
||||
Service.RestartPreventExitStatus, config_parse_set_status, 0, offsetof(Service, restart_prevent_status)
|
||||
Service.RestartForceExitStatus, config_parse_set_status, 0, offsetof(Service, restart_force_status)
|
||||
Service.SuccessExitStatus, config_parse_set_status, 0, offsetof(Service, success_status)
|
||||
m4_ifdef(`HAVE_SYSV_COMPAT',
|
||||
`Service.SysVStartPriority, config_parse_sysv_priority, 0, offsetof(Service, sysv_start_priority)',
|
||||
`Service.SysVStartPriority, config_parse_warn_compat, DISABLED_CONFIGURATION, 0')
|
||||
Service.SysVStartPriority, config_parse_warn_compat, DISABLED_LEGACY, 0
|
||||
Service.NonBlocking, config_parse_bool, 0, offsetof(Service, exec_context.non_blocking)
|
||||
Service.BusName, config_parse_unit_string_printf, 0, offsetof(Service, bus_name)
|
||||
Service.NotifyAccess, config_parse_notify_access, 0, offsetof(Service, notify_access)
|
||||
|
@ -83,6 +83,10 @@ int config_parse_warn_compat(
|
||||
log_syntax(unit, LOG_DEBUG, filename, line, EINVAL,
|
||||
"Support for option %s= has been disabled at compile time and it is ignored", lvalue);
|
||||
break;
|
||||
case DISABLED_LEGACY:
|
||||
log_syntax(unit, LOG_INFO, filename, line, EINVAL,
|
||||
"Support for option %s= has been removed and it is ignored", lvalue);
|
||||
break;
|
||||
case DISABLED_EXPERIMENTAL:
|
||||
log_syntax(unit, LOG_INFO, filename, line, EINVAL,
|
||||
"Support for option %s= has not yet been enabled and it is ignored", lvalue);
|
||||
|
@ -110,5 +110,6 @@ extern const char load_fragment_gperf_nulstr[];
|
||||
|
||||
typedef enum Disabled {
|
||||
DISABLED_CONFIGURATION,
|
||||
DISABLED_LEGACY,
|
||||
DISABLED_EXPERIMENTAL,
|
||||
} Disabled;
|
||||
|
@ -546,13 +546,6 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) {
|
||||
exec_command_dump_list(s->exec_command[c], f, prefix2);
|
||||
}
|
||||
|
||||
#ifdef HAVE_SYSV_COMPAT
|
||||
if (s->sysv_start_priority >= 0)
|
||||
fprintf(f,
|
||||
"%sSysVStartPriority: %i\n",
|
||||
prefix, s->sysv_start_priority);
|
||||
#endif
|
||||
|
||||
if (s->status_text)
|
||||
fprintf(f, "%sStatus Text: %s\n",
|
||||
prefix, s->status_text);
|
||||
|
@ -180,9 +180,6 @@ struct Service {
|
||||
bool bus_name_good:1;
|
||||
bool forbid_restart:1;
|
||||
bool start_timeout_defined:1;
|
||||
#ifdef HAVE_SYSV_COMPAT
|
||||
int sysv_start_priority;
|
||||
#endif
|
||||
|
||||
char *bus_name;
|
||||
|
||||
|
@ -174,9 +174,6 @@ static int generate_unit_file(SysvStub *s) {
|
||||
"RemainAfterExit=%s\n",
|
||||
yes_no(!s->pid_file));
|
||||
|
||||
if (s->sysv_start_priority > 0)
|
||||
fprintf(f, "SysVStartPriority=%d\n", s->sysv_start_priority);
|
||||
|
||||
if (s->pid_file)
|
||||
fprintf(f, "PIDFile=%s\n", s->pid_file);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user