From fdba12213a1542f20c3c8ef2e0db24f98fc52385 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 13 Jan 2016 22:35:17 +0100
Subject: [kdm*] Don't use hard reboot/poweroff as it's not necessary

Long time ago, the normal shutdown procedure would lock up the
system, but this works reliably on newer kernels now.
---
 remote/modules/kdm-theme-bwlp/data/etc/kde4/kdm/kdmrc | 4 ++--
 remote/modules/kdm/data/etc/kde4/kdm/kdmrc            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'remote/modules')

diff --git a/remote/modules/kdm-theme-bwlp/data/etc/kde4/kdm/kdmrc b/remote/modules/kdm-theme-bwlp/data/etc/kde4/kdm/kdmrc
index 0b283d2a..e1f9f357 100644
--- a/remote/modules/kdm-theme-bwlp/data/etc/kde4/kdm/kdmrc
+++ b/remote/modules/kdm-theme-bwlp/data/etc/kde4/kdm/kdmrc
@@ -46,8 +46,8 @@ Startup=/etc/X11/Xstartup
 
 [Shutdown]
 AllowFifo=false
-HaltCmd=/usr/bin/systemctl -ff poweroff
-RebootCmd=/usr/bin/systemctl -ff reboot
+HaltCmd=/usr/bin/systemctl poweroff
+RebootCmd=/usr/bin/systemctl reboot
 
 [Xdmcp]
 Enable=false
diff --git a/remote/modules/kdm/data/etc/kde4/kdm/kdmrc b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
index f7e7be86..5f9f9e39 100644
--- a/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
+++ b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
@@ -44,8 +44,8 @@ Startup=/etc/X11/Xstartup
 
 [Shutdown]
 AllowFifo=false
-HaltCmd=/usr/bin/systemctl -ff poweroff
-RebootCmd=/usr/bin/systemctl -ff reboot
+HaltCmd=/usr/bin/systemctl poweroff
+RebootCmd=/usr/bin/systemctl reboot
 
 [Xdmcp]
 Enable=false
-- 
cgit v1.2.3-55-g7522