summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-06-02 19:15:42 +0200
committerLennart Poettering <lennart@poettering.net>2010-06-02 19:17:23 +0200
commit1f48cf56cb2693b84fdc76dc8df0b048ed50ef43 (patch)
tree7fd4978d2d11076633a98a8935d8689d0f01dd3e /units
parent2c7c61442e6b46571b1f53db05ef7a23227bebe2 (diff)
service: change default service type to 'simple' since that is the future
Diffstat (limited to 'units')
-rw-r--r--units/emergency.service3
-rw-r--r--units/fedora/prefdm.service1
-rw-r--r--units/fedora/rc-local.service1
-rw-r--r--units/gentoo/xdm.service1
-rw-r--r--units/getty@.service.m41
-rw-r--r--units/systemd-initctl.service.in1
-rw-r--r--units/systemd-logger.service.in1
7 files changed, 1 insertions, 8 deletions
diff --git a/units/emergency.service b/units/emergency.service
index 3cbca3d012..924723fefe 100644
--- a/units/emergency.service
+++ b/units/emergency.service
@@ -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
diff --git a/units/fedora/prefdm.service b/units/fedora/prefdm.service
index 291910239f..3428026c54 100644
--- a/units/fedora/prefdm.service
+++ b/units/fedora/prefdm.service
@@ -14,4 +14,3 @@ Conflicts=shutdown.target
[Service]
ExecStart=/etc/X11/prefdm -nodaemon
-Type=simple
diff --git a/units/fedora/rc-local.service b/units/fedora/rc-local.service
index cb0700700b..bd67aab62e 100644
--- a/units/fedora/rc-local.service
+++ b/units/fedora/rc-local.service
@@ -17,7 +17,6 @@ Names=rc-local.service local.service
[Service]
ExecStart=/etc/rc.local start
-Type=simple
TimeoutSec=0
StandardInput=tty
ValidNoProcess=yes
diff --git a/units/gentoo/xdm.service b/units/gentoo/xdm.service
index 8370ef24f8..ac1df75722 100644
--- a/units/gentoo/xdm.service
+++ b/units/gentoo/xdm.service
@@ -14,4 +14,3 @@ Conflicts=shutdown.target
[Service]
ExecStart=/etc/init.d/xdm start
-Type=simple
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index 20ee6e90f7..1ada4ffd01 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -18,7 +18,6 @@ Conflicts=shutdown.target
[Service]
Environment=TERM=linux
-Type=simple
ExecStart=GETTY %I
Restart=restart-always
RestartSec=0
diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in
index 6c93653808..7450e07e61 100644
--- a/units/systemd-initctl.service.in
+++ b/units/systemd-initctl.service.in
@@ -12,4 +12,3 @@ Description=systemd /dev/initctl Compatibility Daemon
[Service]
ExecStart=@rootlibexecdir@/systemd-initctl
-Type=simple
diff --git a/units/systemd-logger.service.in b/units/systemd-logger.service.in
index 5fc0532033..2004438971 100644
--- a/units/systemd-logger.service.in
+++ b/units/systemd-logger.service.in
@@ -13,4 +13,3 @@ After=@SPECIAL_SYSLOG_SERVICE@
[Service]
ExecStart=@rootlibexecdir@/systemd-logger
-Type=simple