summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenry Gebhardt <hsggebhardt@googlemail.com>2012-05-21 14:14:26 +0200
committerHenry Gebhardt <hsggebhardt@googlemail.com>2012-05-21 14:14:26 +0200
commite542c42624abb2771872a7e42373d008b177cc8f (patch)
tree73792cf79652b500ffd097c01ef01a9cb15e6c05
parentsys-apps/systemd-units: remove mpd.service (diff)
downloadsystemd-e542c42624abb2771872a7e42373d008b177cc8f.tar.gz
systemd-e542c42624abb2771872a7e42373d008b177cc8f.tar.bz2
systemd-e542c42624abb2771872a7e42373d008b177cc8f.zip
sys-apps/systemd-units: fix kdm@.service
bugs #390493 and #391339. Please test.
-rw-r--r--sys-apps/systemd-units/Manifest2
-rw-r--r--sys-apps/systemd-units/files/services-desktop/kdm_at.service5
2 files changed, 3 insertions, 4 deletions
diff --git a/sys-apps/systemd-units/Manifest b/sys-apps/systemd-units/Manifest
index f9280ae..385d332 100644
--- a/sys-apps/systemd-units/Manifest
+++ b/sys-apps/systemd-units/Manifest
@@ -6,7 +6,7 @@ AUX services-basic/vixie-cron.service 158 RMD160 5135b058277a8c68e89fad06ac5096c
AUX services-desktop/gdm_at.service 249 RMD160 518e692742336f7f2d2bd4b0d2f73fd0aa4c7bd2 SHA1 dba2a5b1e6c4e2b3e9e8879bc0926a28f5ee6eba SHA256 fbc77d9aa6e0dd1631244d3fe4663e09f4078cad2ab71c0c12b7077e67f7fd91
AUX services-desktop/hald.service 209 RMD160 a82a68ec5406835e77124428e5f9bb624b458e86 SHA1 02d507bf0102c72553fea7e95e7763a5e7e629e9 SHA256 9cc914dedf756c9ca173ea86e89de36b7945ff3572b206a86bc53ba2a6dd75b8
AUX services-desktop/iptables.service 478 RMD160 c95eebf8e1ba7ee1dce7400700bed232630e20f8 SHA1 b8eb5762a16785ead4d3d6e7dd1da59c99b50b78 SHA256 0f382f4145cd082c9f617bdeac279dc9ad4b89d8c5def414611cc16e53f04fc5
-AUX services-desktop/kdm_at.service 284 RMD160 14edb6e7f3d75df223a5035ceffd66b861cc220d SHA1 b9e9f0624ac5f24ef75f090fc82a70daddc2bf95 SHA256 99c8e775549497607e5e41a0fe9cbc11b46acfc1ac5aeca0370f45605ec01fa2
+AUX services-desktop/kdm_at.service 256 RMD160 d6db48e19c36b50611ffd7919203c0618b1edc04 SHA1 cbf28386d2afeea494e73fa17d60ffaae468ad73 SHA256 75d5ead69036522d49d6d6ca053d2a2a730ffcb852420008d4be9f850b9ef9d1
AUX services-desktop/openvpn_at.service 156 RMD160 41159cdeb729454e89e1fa3a477b9b747cf7e110 SHA1 b059b087261acead7a7d548a5cec3be25d2d3d87 SHA256 dc57bf10e4f77845014ab20f29d73c024fa91efc5fea8e4af2a3cffb6ad8d68b
AUX services-desktop/policykit-daemon.service 173 RMD160 c333d90e4cf3dd0ec87f1293953d5c595596aa3a SHA1 7f5a877ff6eac535e23b3f068fdd4aa1976eca84 SHA256 7da5a8d0f19c9ce47cdc13244cb224d31e360c935d72974b49616c3251cb9106
AUX services-desktop/powernowd.service 133 RMD160 ce0e641d57957a18aaed44e9a60488c24fb341d9 SHA1 e289c3b39371efc282bf2324a4681a37848572f6 SHA256 e203268119c306bf205a3bf4de1a5ff3d4cb79700f445426ed38fa389c2a8e4b
diff --git a/sys-apps/systemd-units/files/services-desktop/kdm_at.service b/sys-apps/systemd-units/files/services-desktop/kdm_at.service
index bc8431e..77a22f0 100644
--- a/sys-apps/systemd-units/files/services-desktop/kdm_at.service
+++ b/sys-apps/systemd-units/files/services-desktop/kdm_at.service
@@ -4,9 +4,8 @@ Requires=dev-%i.device
After=dev-%i.device systemd-user-sessions.service
[Service]
-ExecStart=/usr/bin/kdm -nodaemon -error /dev/stdout %I
-StandardOutput=syslog
-StandardError=syslog
+ExecStart=/usr/bin/kdm -nodaemon %I
+ExecStop=/usr/sbin/kdmctl suicide
[Install]
Alias=graphical.target.wants/kdm@tty7.service