summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-10-05 20:30:44 +0200
committerLennart Poettering <lennart@poettering.net>2010-10-05 20:30:44 +0200
commit525ee6f4a1639bcb28198bf9e32b93ca2bfd268b (patch)
tree0fe1a65c8b084a4d754ca810f2397bf13640e4e1 /src
parentd0b4880988c5900c0f951aa6fe700686411cd03e (diff)
service: rename settings for Restart= from 'restart-always' to 'always' and similar
Diffstat (limited to 'src')
-rw-r--r--src/service.c8
-rw-r--r--src/service.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/service.c b/src/service.c
index 301633ec7e..116e539d95 100644
--- a/src/service.c
+++ b/src/service.c
@@ -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);
diff --git a/src/service.h b/src/service.h
index e2b11db671..f47346702f 100644
--- a/src/service.h
+++ b/src/service.h
@@ -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,