shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-01 09:47:35 +03:00
Code

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

Browse Source
This commit is contained in:
Lennart Poettering 2010-10-05 20:30:44 +02:00
parent d0b4880988
commit 525ee6f4a1
9 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fixme
View File

@ -107,6 +107,8 @@ later:
* enable syslog.socket by default, activating our kmsg bridge * enable syslog.socket by default, activating our kmsg bridge
* Restart=on-failure and Restart=on-abort
External: External:
* place /etc/inittab with explaining blurb. * place /etc/inittab with explaining blurb.

12
man/systemd.service.xml
View File

@ -428,17 +428,17 @@
<listitem><para>Configures whether the <listitem><para>Configures whether the
main service process shall be restarted when main service process shall be restarted when
it exists. Takes one of it exists. Takes one of
<option>once</option>, <option>no</option>,
<option>restart-on-success</option> or <option>on-success</option> or
<option>restart-always</option>. If <option>always</option>. If
set to <option>once</option> (the set to <option>no</option> (the
default) the service will not be default) the service will not be
restarted when it exits. If set to 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 will be restarted only when it exited
cleanly, i.e. terminated with an exit cleanly, i.e. terminated with an exit
code of 0. If set to code of 0. If set to
<option>restart-always</option> the <option>always</option> the
service will be restarted regardless service will be restarted regardless
whether it exited cleanly or not, or whether it exited cleanly or not, or
got terminated abnormally by a got terminated abnormally by a

8
src/service.c
View File

@ -795,7 +795,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
/* Special setting for all SysV services */ /* Special setting for all SysV services */
s->type = SERVICE_FORKING; s->type = SERVICE_FORKING;
s->remain_after_exit = true; s->remain_after_exit = true;
s->restart = SERVICE_ONCE; s->restart = SERVICE_RESTART_NO;
s->exec_context.std_output = s->exec_context.std_output =
(s->meta.manager->sysv_console || s->exec_context.std_input == EXEC_INPUT_TTY) (s->meta.manager->sysv_console || s->exec_context.std_input == EXEC_INPUT_TTY)
? EXEC_OUTPUT_TTY : EXEC_OUTPUT_NULL; ? 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); DEFINE_STRING_TABLE_LOOKUP(service_state, ServiceState);
static const char* const service_restart_table[_SERVICE_RESTART_MAX] = { static const char* const service_restart_table[_SERVICE_RESTART_MAX] = {
[SERVICE_ONCE] = "once", [SERVICE_RESTART_NO] = "no",
[SERVICE_RESTART_ON_SUCCESS] = "restart-on-success", [SERVICE_RESTART_ON_SUCCESS] = "on-success",
[SERVICE_RESTART_ALWAYS] = "restart-always", [SERVICE_RESTART_ALWAYS] = "always",
}; };
DEFINE_STRING_TABLE_LOOKUP(service_restart, ServiceRestart); DEFINE_STRING_TABLE_LOOKUP(service_restart, ServiceRestart);

2
src/service.h
View File

@ -48,7 +48,7 @@ typedef enum ServiceState {
} ServiceState; } ServiceState;
typedef enum ServiceRestart { typedef enum ServiceRestart {
SERVICE_ONCE, SERVICE_RESTART_NO,
SERVICE_RESTART_ON_SUCCESS, SERVICE_RESTART_ON_SUCCESS,
SERVICE_RESTART_ALWAYS, SERVICE_RESTART_ALWAYS,
_SERVICE_RESTART_MAX, _SERVICE_RESTART_MAX,

2
units/emergency.service
View File

@ -18,7 +18,7 @@ ExecStartPre=-/bin/plymouth --hide-splash
ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" to activate default mode.' ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" to activate default mode.'
ExecStart=-/sbin/sulogin ExecStart=-/sbin/sulogin
StandardInput=tty-force StandardInput=tty-force
Restart=restart-always Restart=always
RestartSec=0 RestartSec=0
KillMode=process-group KillMode=process-group

2
units/fedora/prefdm.service
View File

@ -16,7 +16,7 @@ After=getty@tty1.service plymouth-quit.service
[Service] [Service]
ExecStart=/etc/X11/prefdm -nodaemon ExecStart=/etc/X11/prefdm -nodaemon
Restart=restart-always Restart=always
RestartSec=0 RestartSec=0
[Install] [Install]

2
units/fedora/single.service
View File

@ -21,7 +21,7 @@ ExecStartPre=-/bin/plymouth --hide-splash
ExecStartPre=-/bin/echo 'Welcome to rescue mode. Use "systemctl default" to activate default mode.' ExecStartPre=-/bin/echo 'Welcome to rescue mode. Use "systemctl default" to activate default mode.'
ExecStart=-/sbin/sulogin ExecStart=-/sbin/sulogin
StandardInput=tty-force StandardInput=tty-force
Restart=restart-always Restart=always
RestartSec=0 RestartSec=0
KillMode=process-group KillMode=process-group

2
units/getty@.service.m4
View File

@ -31,7 +31,7 @@ Before=getty.target
[Service] [Service]
Environment=TERM=linux Environment=TERM=linux
ExecStart=-GETTY %I ExecStart=-GETTY %I
Restart=restart-always Restart=always
RestartSec=0 RestartSec=0
KillMode=process-group KillMode=process-group

2
units/serial-getty@.service.m4
View File

@ -28,7 +28,7 @@ m4_ifdef(`TARGET_FEDORA',
ExecStartPre=-/sbin/securetty %I ExecStartPre=-/sbin/securetty %I
)m4_dnl )m4_dnl
ExecStart=-/sbin/agetty -s %I 115200,38400,9600 ExecStart=-/sbin/agetty -s %I 115200,38400,9600
Restart=restart-always Restart=always
RestartSec=0 RestartSec=0
KillMode=process-group KillMode=process-group