Commit 525ee6f4 authored by Lennart Poettering's avatar Lennart Poettering

service: rename settings for Restart= from 'restart-always' to 'always' and similar

parent d0b48809
......@@ -107,6 +107,8 @@ later:
* enable syslog.socket by default, activating our kmsg bridge
* Restart=on-failure and Restart=on-abort
External:
* place /etc/inittab with explaining blurb.
......
......@@ -428,17 +428,17 @@
<listitem><para>Configures whether the
main service process shall be restarted when
it exists. Takes one of
<option>once</option>,
<option>restart-on-success</option> or
<option>restart-always</option>. If
set to <option>once</option> (the
<option>no</option>,
<option>on-success</option> or
<option>always</option>. If
set to <option>no</option> (the
default) the service will not be
restarted when it exits. If set to
<option>restart-on-success</option> it
<option>on-success</option> it
will be restarted only when it exited
cleanly, i.e. terminated with an exit
code of 0. If set to
<option>restart-always</option> the
<option>always</option> the
service will be restarted regardless
whether it exited cleanly or not, or
got terminated abnormally by a
......
......@@ -795,7 +795,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
/* Special setting for all SysV services */
s->type = SERVICE_FORKING;
s->remain_after_exit = true;
s->restart = SERVICE_ONCE;
s->restart = SERVICE_RESTART_NO;
s->exec_context.std_output =
(s->meta.manager->sysv_console || s->exec_context.std_input == EXEC_INPUT_TTY)
? EXEC_OUTPUT_TTY : EXEC_OUTPUT_NULL;
......@@ -3109,9 +3109,9 @@ static const char* const service_state_table[_SERVICE_STATE_MAX] = {
DEFINE_STRING_TABLE_LOOKUP(service_state, ServiceState);
static const char* const service_restart_table[_SERVICE_RESTART_MAX] = {
[SERVICE_ONCE] = "once",
[SERVICE_RESTART_ON_SUCCESS] = "restart-on-success",
[SERVICE_RESTART_ALWAYS] = "restart-always",
[SERVICE_RESTART_NO] = "no",
[SERVICE_RESTART_ON_SUCCESS] = "on-success",
[SERVICE_RESTART_ALWAYS] = "always",
};
DEFINE_STRING_TABLE_LOOKUP(service_restart, ServiceRestart);
......
......@@ -48,7 +48,7 @@ typedef enum ServiceState {
} ServiceState;
typedef enum ServiceRestart {
SERVICE_ONCE,
SERVICE_RESTART_NO,
SERVICE_RESTART_ON_SUCCESS,
SERVICE_RESTART_ALWAYS,
_SERVICE_RESTART_MAX,
......
......@@ -18,7 +18,7 @@ ExecStartPre=-/bin/plymouth --hide-splash
ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" to activate default mode.'
ExecStart=-/sbin/sulogin
StandardInput=tty-force
Restart=restart-always
Restart=always
RestartSec=0
KillMode=process-group
......
......@@ -16,7 +16,7 @@ After=getty@tty1.service plymouth-quit.service
[Service]
ExecStart=/etc/X11/prefdm -nodaemon
Restart=restart-always
Restart=always
RestartSec=0
[Install]
......
......@@ -21,7 +21,7 @@ ExecStartPre=-/bin/plymouth --hide-splash
ExecStartPre=-/bin/echo 'Welcome to rescue mode. Use "systemctl default" to activate default mode.'
ExecStart=-/sbin/sulogin
StandardInput=tty-force
Restart=restart-always
Restart=always
RestartSec=0
KillMode=process-group
......
......@@ -31,7 +31,7 @@ Before=getty.target
[Service]
Environment=TERM=linux
ExecStart=-GETTY %I
Restart=restart-always
Restart=always
RestartSec=0
KillMode=process-group
......
......@@ -28,7 +28,7 @@ m4_ifdef(`TARGET_FEDORA',
ExecStartPre=-/sbin/securetty %I
)m4_dnl
ExecStart=-/sbin/agetty -s %I 115200,38400,9600
Restart=restart-always
Restart=always
RestartSec=0
KillMode=process-group
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment