summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-30 10:42:53 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-30 19:10:40 -0500
commit9e37c9544b22aab2173695ac9c0e4b8bb02cb75c (patch)
tree5311e9f9ce751761d24280f2e89e212c8252098e
parenta2c0e528b8b5ba370527db279605e4e4135689c1 (diff)
core: warn and ignore SysVStartPriority=
Option was being parsed but not used for anything.
-rw-r--r--man/systemd.service.xml34
-rw-r--r--src/core/load-fragment-gperf.gperf.m44
-rw-r--r--src/core/load-fragment.c4
-rw-r--r--src/core/load-fragment.h1
-rw-r--r--src/core/service.c7
-rw-r--r--src/core/service.h3
-rw-r--r--src/sysv-generator/sysv-generator.c3
7 files changed, 6 insertions, 50 deletions
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index e563b1968b..6e81c5429b 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -1131,40 +1131,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>
<para>This section describes command line parsing and
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
index b5a8e31c09..e0ffaa605a 100644
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -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)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 786737da94..d3859683a1 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -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);
diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
index 4756830302..21e0871e8b 100644
--- a/src/core/load-fragment.h
+++ b/src/core/load-fragment.h
@@ -110,5 +110,6 @@ extern const char load_fragment_gperf_nulstr[];
typedef enum Disabled {
DISABLED_CONFIGURATION,
+ DISABLED_LEGACY,
DISABLED_EXPERIMENTAL,
} Disabled;
diff --git a/src/core/service.c b/src/core/service.c
index 9db773b399..53a2935e52 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -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);
diff --git a/src/core/service.h b/src/core/service.h
index 54fbe46fa4..f6a78c403b 100644
--- a/src/core/service.h
+++ b/src/core/service.h
@@ -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;
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index e6eef315e9..45c8b4ea0f 100644
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -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);