18 files changed, 18 insertions, 18 deletions
diff --git a/units/arch/halt.service b/units/arch/halt.service
index b1935262f7..dbfc228787 100644
--- a/units/arch/halt.service
+++ b/units/arch/halt.service
@@ -12,7 +12,7 @@ Requires=shutdown.target umount.target
 After=shutdown.target umount.target
 
 [Service]
-Type=finish
+Type=oneshot
 ValidNoProcess=yes
 Environment=RUNLEVEL=0
 ExecStart=/etc/rc.shutdown
diff --git a/units/arch/poweroff.service b/units/arch/poweroff.service
index 3d40ba82c2..bd563ba586 100644
--- a/units/arch/poweroff.service
+++ b/units/arch/poweroff.service
@@ -12,7 +12,7 @@ Requires=shutdown.target umount.target
 After=shutdown.target umount.target
 
 [Service]
-Type=finish
+Type=oneshot
 ValidNoProcess=yes
 Environment=RUNLEVEL=0
 ExecStart=/etc/rc.shutdown
diff --git a/units/arch/reboot.service b/units/arch/reboot.service
index 37112fe9f3..6bce95d8fd 100644
--- a/units/arch/reboot.service
+++ b/units/arch/reboot.service
@@ -12,7 +12,7 @@ Requires=shutdown.target umount.target
 After=shutdown.target umount.target
 
 [Service]
-Type=finish
+Type=oneshot
 ValidNoProcess=yes
 Environment=RUNLEVEL=6
 ExecStart=/etc/rc.shutdown
diff --git a/units/fedora/halt.service b/units/fedora/halt.service
index 6e2745eedd..a6c4786a8b 100644
--- a/units/fedora/halt.service
+++ b/units/fedora/halt.service
@@ -12,7 +12,7 @@ Requires=shutdown.target umount.target killall.service
 After=shutdown.target umount.target killall.service
 
 [Service]
-Type=finish
+Type=oneshot
 ValidNoProcess=yes
 Environment=INIT_HALT=HALT RUNLEVEL=0
 ExecStart=/etc/init.d/halt start
diff --git a/units/fedora/killall.service b/units/fedora/killall.service
index 3b27375fe5..53c65d4a3b 100644
--- a/units/fedora/killall.service
+++ b/units/fedora/killall.service
@@ -12,7 +12,7 @@ After=shutdown.target
 RefuseManualStart=yes
 
 [Service]
-Type=finish
+Type=oneshot
 ValidNoProcess=yes
 ExecStart=-/etc/init.d/killall start
 StandardOutput=tty
diff --git a/units/fedora/plymouth-quit.service b/units/fedora/plymouth-quit.service
index faf8b4d7a7..869a2ec596 100644
--- a/units/fedora/plymouth-quit.service
+++ b/units/fedora/plymouth-quit.service
@@ -11,7 +11,7 @@ Before=getty@tty1.service
 
 [Service]
 ExecStart=-/usr/bin/plymouth quit
-Type=finish
+Type=oneshot
 
 [Install]
 WantedBy=multi-user.target
diff --git a/units/fedora/poweroff.service b/units/fedora/poweroff.service
index cd6ec3edc9..7597f4f651 100644
--- a/units/fedora/poweroff.service
+++ b/units/fedora/poweroff.service
@@ -12,7 +12,7 @@ Requires=shutdown.target umount.target killall.service
 After=shutdown.target umount.target killall.service
 
 [Service]
-Type=finish
+Type=oneshot
 ValidNoProcess=yes
 Environment=RUNLEVEL=0
 ExecStart=/etc/init.d/halt start
diff --git a/units/fedora/reboot.service b/units/fedora/reboot.service
index 01bd46395d..6120ceb821 100644
--- a/units/fedora/reboot.service
+++ b/units/fedora/reboot.service
@@ -12,7 +12,7 @@ Requires=shutdown.target umount.target killall.service
 After=shutdown.target umount.target killall.service
 
 [Service]
-Type=finish
+Type=oneshot
 ValidNoProcess=yes
 Environment=RUNLEVEL=6
 ExecStart=/etc/init.d/reboot start
diff --git a/units/gentoo/halt.service b/units/gentoo/halt.service
index 56c3f2e60e..826c69f061 100644
--- a/units/gentoo/halt.service
+++ b/units/gentoo/halt.service
@@ -12,7 +12,7 @@ Requires=shutdown.target umount.target killall.service
 After=shutdown.target umount.target killall.service
 
 [Service]
-Type=finish
+Type=oneshot
 ValidNoProcess=yes
 Environment=INIT_HALT=HALT RC_DOWN_HARDDISK=yes
 ExecStart=/etc/init.d/shutdown.sh
diff --git a/units/gentoo/killall.service b/units/gentoo/killall.service
index 3f107e3be5..8b42af87b5 100644
--- a/units/gentoo/killall.service
+++ b/units/gentoo/killall.service
@@ -12,7 +12,7 @@ After=shutdown.target
 RefuseManualStart=yes
 
 [Service]
-Type=finish
+Type=oneshot
 ValidNoProcess=yes
 ExecStart=-/etc/init.d/killprocs start
 StandardOutput=tty
diff --git a/units/gentoo/poweroff.service b/units/gentoo/poweroff.service
index 40126b211e..8a5a62794f 100644
--- a/units/gentoo/poweroff.service
+++ b/units/gentoo/poweroff.service
@@ -12,7 +12,7 @@ Requires=shutdown.target umount.target killall.service
 After=shutdown.target umount.target killall.service
 
 [Service]
-Type=finish
+Type=oneshot
 ValidNoProcess=yes
 Environment=RC_DOWN_HARDDISK=yes
 ExecStart=/etc/init.d/shutdown.sh
diff --git a/units/gentoo/reboot.service b/units/gentoo/reboot.service
index de1665579d..b5defb1680 100644
--- a/units/gentoo/reboot.service
+++ b/units/gentoo/reboot.service
@@ -12,7 +12,7 @@ Requires=shutdown.target umount.target killall.service
 After=shutdown.target umount.target killall.service
 
 [Service]
-Type=finish
+Type=oneshot
 ValidNoProcess=yes
 ExecStart=/etc/init.d/reboot.sh
 StandardOutput=tty
diff --git a/units/session/exit.service.in b/units/session/exit.service.in
index 1f515a75ce..d098d0da50 100644
--- a/units/session/exit.service.in
+++ b/units/session/exit.service.in
@@ -5,5 +5,5 @@ Requires=shutdown.target
 After=shutdown.target
 
 [Service]
-Type=finish
+Type=oneshot
 ExecStart=@SYSTEMCTL@ --session daemon-exit
diff --git a/units/suse/halt.service b/units/suse/halt.service
index 559a51ce75..32b7dc204a 100644
--- a/units/suse/halt.service
+++ b/units/suse/halt.service
@@ -12,7 +12,7 @@ Requires=shutdown.target umount.target
 After=shutdown.target umount.target
 
 [Service]
-Type=finish
+Type=oneshot
 ValidNoProcess=yes
 Environment=INIT_HALT=HALT RUNLEVEL=0 COLD_BOOT=1
 ExecStart=/etc/init.d/halt
diff --git a/units/suse/poweroff.service b/units/suse/poweroff.service
index f68882c143..13b13b0427 100644
--- a/units/suse/poweroff.service
+++ b/units/suse/poweroff.service
@@ -12,7 +12,7 @@ Requires=shutdown.target umount.target
 After=shutdown.target umount.target
 
 [Service]
-Type=finish
+Type=oneshot
 ValidNoProcess=yes
 Environment=COLD_BOOT=1
 ExecStart=/etc/init.d/halt
diff --git a/units/suse/reboot.service b/units/suse/reboot.service
index 6b2982a9a0..3ee290e659 100644
--- a/units/suse/reboot.service
+++ b/units/suse/reboot.service
@@ -12,7 +12,7 @@ Requires=shutdown.target umount.target
 After=shutdown.target umount.target
 
 [Service]
-Type=finish
+Type=oneshot
 ValidNoProcess=yes
 Environment=COLD_BOOT=1
 ExecStart=/etc/init.d/reboot
diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in
index 9b7677f3a1..90bb9379e0 100644
--- a/units/systemd-update-utmp-runlevel.service.in
+++ b/units/systemd-update-utmp-runlevel.service.in
@@ -11,5 +11,5 @@ DefaultDependencies=no
 After=runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target auditd.service
 
 [Service]
-Type=finish
+Type=oneshot
 ExecStart=-@rootlibexecdir@/systemd-update-utmp runlevel
diff --git a/units/systemd-update-utmp-shutdown.service.in b/units/systemd-update-utmp-shutdown.service.in
index 0551a9b7e2..f5d1342243 100644
--- a/units/systemd-update-utmp-shutdown.service.in
+++ b/units/systemd-update-utmp-shutdown.service.in
@@ -12,5 +12,5 @@ Before=killall.service
 Conflicts=systemd-update-utmp-runlevel.service
 
 [Service]
-Type=finish
+Type=oneshot
 ExecStart=-@rootlibexecdir@/systemd-update-utmp shutdown