Commit 1f48cf56 authored by Lennart Poettering's avatar Lennart Poettering

service: change default service type to 'simple' since that is the future

parent 2c7c6144
......@@ -340,9 +340,6 @@ static int service_load_sysv_path(Service *s, const char *path) {
goto finish;
}
s->type = SERVICE_FORKING;
s->restart = SERVICE_ONCE;
free(s->sysv_path);
if (!(s->sysv_path = strdup(path))) {
r = -ENOMEM;
......@@ -650,8 +647,10 @@ static int service_load_sysv_path(Service *s, const char *path) {
s->timeout_usec = 0;
/* Special setting for all SysV services */
s->type = SERVICE_FORKING;
s->valid_no_process = true;
s->kill_mode = KILL_PROCESS_GROUP;
s->restart = SERVICE_ONCE;
u->meta.load_state = UNIT_LOADED;
r = 0;
......
......@@ -56,8 +56,8 @@ typedef enum ServiceRestart {
} ServiceRestart;
typedef enum ServiceType {
SERVICE_FORKING, /* forks by itself (i.e. traditional daemons) */
SERVICE_SIMPLE, /* we fork and go on right-away (i.e. modern socket activated daemons) */
SERVICE_FORKING, /* forks by itself (i.e. traditional daemons) */
SERVICE_FINISH, /* we fork and wait until the program finishes (i.e. programs like fsck which run and need to finish before we continue) */
SERVICE_DBUS, /* we fork and wait until a specific D-Bus name appears on the bus */
_SERVICE_TYPE_MAX,
......
......@@ -12,8 +12,7 @@ Description=Emergency Shell
[Service]
ExecStart=/bin/sh
Type=simple
StandardInput=tty
Restart=restart-always
RestartSec=0
KillMode=process
KillMode=process-group
......@@ -14,4 +14,3 @@ Conflicts=shutdown.target
[Service]
ExecStart=/etc/X11/prefdm -nodaemon
Type=simple
......@@ -17,7 +17,6 @@ Names=rc-local.service local.service
[Service]
ExecStart=/etc/rc.local start
Type=simple
TimeoutSec=0
StandardInput=tty
ValidNoProcess=yes
......
......@@ -14,4 +14,3 @@ Conflicts=shutdown.target
[Service]
ExecStart=/etc/init.d/xdm start
Type=simple
......@@ -18,7 +18,6 @@ Conflicts=shutdown.target
[Service]
Environment=TERM=linux
Type=simple
ExecStart=GETTY %I
Restart=restart-always
RestartSec=0
......
......@@ -12,4 +12,3 @@ Description=systemd /dev/initctl Compatibility Daemon
[Service]
ExecStart=@rootlibexecdir@/systemd-initctl
Type=simple
......@@ -13,4 +13,3 @@ After=@SPECIAL_SYSLOG_SERVICE@
[Service]
ExecStart=@rootlibexecdir@/systemd-logger
Type=simple
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