systemd-units: update gdm.service and slim.service

Delete old-style gdm@.service and slim@.service

5 files changed, 25 insertions, 24 deletions

diff --git a/sys-apps/systemd-units/Manifest b/sys-apps/systemd-units/Manifest
index a634dd4..97775b6 100644
--- a/sys-apps/systemd-units/Manifest
+++ b/sys-apps/systemd-units/Manifest
@@ -3,13 +3,13 @@ AUX services-basic/fcron.service 205 SHA256 7f84db0e0f2c255582bce17fb9c85ab13aa0
 AUX services-basic/metalog.service 147 SHA256 b6f26fd6e3a035c7bdb58706c4f2b7753d230f4a40d68d24f0c3715e74811698 SHA512 4e6b644b50a765a20d12d14ac6c4562d3a99e470f60d82e9acd2b9c463daf478795d336fdfe57a6669d834a077f99b05ceb70ca13dc364c8f26a30450d2e8444 WHIRLPOOL 5e2c543cb8bd20dd92d80e16a4502a0568d22cce710bc6a3a20ba45b394bf21d8b06ee2bc920ada19ecad6839f695e1146b256b212eef12f19719cbf43eb316e
 AUX services-basic/syslog-ng.service 150 SHA256 8e936cee3ffb7941c46b418b3208246e46948404ac0f062a0ef2f3f94d8ecc83 SHA512 ff87217f8255f867b198f1206feffee39d7bda52adf313a65656959ca79c78d6b29cd9f500ea9ab1731270780f4ee6610db9f5fe06ea4e2ff4137e6a9519bbfb WHIRLPOOL 42fcfaa56da1c2feafb69c7f25593694935f6c2428e660011335a223122c4549b204d0b3795553fa7679ae2865688fcade04fb9dc809d3c9f258ecea42552987
 AUX services-basic/vixie-cron.service 158 SHA256 54c27aef74a98ad7a2c74456b4e8aa933ae13aa9ee7ac2dbffabc449a7c95b3d SHA512 ac4d0c243ff651708a7dd9131a82fd2379fdcecff929bc58c25e9ac3668ef94b65bcd385877ce129ae3bfa47dc542b597453028d54cd82100f28c7456841e7b6 WHIRLPOOL f6f04b84939d2fc3c8f9d96ce7e1afd77cf687c976473097ef45acedc9e3eeb74cc44f26d1a665385ac9d72b24e8f67092a9481fb19b1bc8abc2ea19338601d5
-AUX services-desktop/gdm_at.service 249 SHA256 fbc77d9aa6e0dd1631244d3fe4663e09f4078cad2ab71c0c12b7077e67f7fd91 SHA512 f87e417680341b59be0d8edd50a81eeae29d7bdc16a61bc94701ba82fc2184370671667c5df459847be761549e242bf38e211e56825f1d32d8aea187c1a3940c WHIRLPOOL bd2610f628bf84eb3fde75bdc0e67311cdb6e537fdf05d8c1126bd34c0038dbb59b700e74bdfcdf50ed39f565ef6e40d18657db831e2579e9c0be4a727212b52
+AUX services-desktop/gdm.service 275 SHA256 39e3260a20ef616fa0a32cd1345100d349b873e7ae64fc3872aa65316abbcb1f SHA512 eec3c140312adb66074dadb19b5f14975f551ce9280ab423f23df330a7733ef63f695f9c5b2e9fcc65afb76c725873b56318e3f13b898274eeeaa1060ed26af6 WHIRLPOOL 7009ae3d5a892b493b17cd120190529500e8b4a01dede3289cfdcf4a912245ff57aa3bcb77d215f73719d1c4b24e97669cbbed637b012666419b60b708d3d482
 AUX services-desktop/hald.service 209 SHA256 9cc914dedf756c9ca173ea86e89de36b7945ff3572b206a86bc53ba2a6dd75b8 SHA512 164009fe2e5c0e340872f0e88bb339b9a743b3b2eaf412c7b65bca0488d880a22d21220aed2c6e4e9a9ac5277d3ed65d57052049a25b15dc515a309d95f5c63c WHIRLPOOL cf19a4a54e7c566f17bae95d1b8303acd38d785c9781fc3e6fb0bbc8f68c3fff3f847ef02c113d086edb65792a3ab73df3962fda0fdb68bcb86fb1af68b8b9d8
 AUX services-desktop/iptables.service 478 SHA256 0f382f4145cd082c9f617bdeac279dc9ad4b89d8c5def414611cc16e53f04fc5 SHA512 e23cbb1c38d39f2319ebc9efa685b2f19f568e84ca160e87c62a65ed146664a3f0c35871231d1b5b51b3197a72f6029b97ef9815f9ec4e3dafa61a61b404f1db WHIRLPOOL 8ca2b88d59dd0ce56b779720cb1b443c1749e3a6008182bd42191d5c3d4699b1e8a9031d777717de49202016a4f0d502a9b197af90bef39a7c83acba67b45f31
 AUX services-desktop/kdm.service 262 SHA256 0ef99310cc6527fa49a81fc227f521d44347f3333ef6dd226f17b84e4120c003 SHA512 4a8cbf8398f1c72a7f1497bd08e3eb2118de0b7259cbcc0bf9200a01fed0a2769e10d6ecfc0938efb90e581df68bb0003678be072034ffe0daae256f598f2e17 WHIRLPOOL 171698de9503798655503ca998ff51ffe1d2177fbb542218b64e36991177cb5043cbf85df847d82441028efef251719c7a67220ea16f9387e9eaa09b13ccf722
 AUX services-desktop/openvpn_at.service 156 SHA256 dc57bf10e4f77845014ab20f29d73c024fa91efc5fea8e4af2a3cffb6ad8d68b SHA512 163ddbcd231aabde34840d5389da899f95c9dfea45d6d652f47fa01a8fe6b9552361a95c61148f977f3e3c02baa06eafda7b504de295ddb680f670a51867d4b7 WHIRLPOOL 4f750e50b2626bf284845a4fa5a7eac630a5e772e7797685f6ecd542ffba4243284dd1c834b1488deadd2edeaffd5564cb570cda4e36211b326b326cc448768f
 AUX services-desktop/powernowd.service 133 SHA256 e203268119c306bf205a3bf4de1a5ff3d4cb79700f445426ed38fa389c2a8e4b SHA512 a5d1595f40e97d7380755b081c695a12525788b2bbefa1f5601d9b46de74f5e5d8ab327f2b2c62bdc8b9a8deaf0a87fe87906b623fd5929359e36263d9ec8ffa WHIRLPOOL 10139bb5b971ee7a5ad92ab190cb3bbcb28c62a4176a9af43f117f966b08e5894ba09a2765687ee7062d1168f23692a2d471017149cd8cc592452f364f74ac6c
-AUX services-desktop/slim_at.service 218 SHA256 5c3a659dcba84a34c2270f6d59ad54718bb2e5bdf2497675fcb1005628b690b5 SHA512 2d51b0715b4b4390162cb3db2fead115cfe4f51ee534f4bdbd865d75c7b054577648e49ec2c4300b378ba68b89477dba65e1560aad1e939d39647f78311fbede WHIRLPOOL 6afcf2974bc52ae0c0e17efa96e9d19c025dbe229e5aa7237d6dfa545f247376b027261a0f31cd82477f0162d05ce6d7dbf10730de9fe667099e52e1cb588bda
+AUX services-desktop/slim.service 249 SHA256 a6928669249fac1ac0cfa24638743b741fe5fabf44cd5b26332e1a982408fcc9 SHA512 5ca991f9b06be5a13532868458150eef3a801747cf3e8ac7f32f79689c22ea3ebec0e0c82730210e8e38877dda7f689bd268012fc3bdcf1b3b937e747c226c58 WHIRLPOOL 5f8cf1f9511ae253a8d5b454da6943f6f5b464bdbb39c0e47aec7abbdb681003d06e0e69addba82d011ca9e36d3afb3a1f1a38d3a289f67d45ba9b6692d2b9e2
 AUX services-server/apache2.service 518 SHA256 701d72c63cdaf4d7c01d0e57126d5f4448d0254e2b7090be7c0344b2d2561ac8 SHA512 17d97fa44e970621f34c0e96bd413629217b7aeb1103446954341253ad8a40ec0396ef26863a274f318231c685603964cd6dfee97d687eda257d24b27f899b80 WHIRLPOOL 2784e6ce1e8f10d96d3dfa94e021c0978f0075b7d32f7e6bb8b7f4f7219ead573e810fe0beffb2b1377ec73918101c347c058ad223bf213c00b3de0df9b3dcc9
 AUX services-server/courier-authdaemond.service 376 SHA256 a275d29b61029b92e7ce76c1d16f9ec943a6cd0e2199821811253fabb6801370 SHA512 534f64625c21d65b22d3887c649df94615daaa80cc49800877c93990a1974998099d94585b49a2b5b7f637c106cc72b9caec1b79c8a3f7e7e82be731e9ebb124 WHIRLPOOL b1b68a2d4c9d11ddc18b41e3e3be19dbb121d03997a82e67afa94855a62391aedaee60d70728d14d362296d3097241a2d7786db3c3471e08b17153d8df3c98b6
 AUX services-server/courier-imapd.service 265 SHA256 48c43249df0b0a2ff18372fca67d36da290f73bc1f9b453365015554985ca38e SHA512 154101170d1c7f03d3c63693695037027dfc36b086fa47bed4631de478f4a33c839dadc354990be2d0ecde1c27868f0d456565ced3fff79eaddd61199388c23e WHIRLPOOL 9eb2a50e5ce26a27aeeb42c6d91e55aeba3f033f2689777dce8782bb6d21a777ef575351ce41b3c51a0cb6f1475a887254fa1a4646c56bdf5fab01619426135c
diff --git a/sys-apps/systemd-units/files/services-desktop/gdm.service b/sys-apps/systemd-units/files/services-desktop/gdm.service
new file mode 100644
index 0000000..5b4d271
--- /dev/null
+++ b/sys-apps/systemd-units/files/services-desktop/gdm.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Gnome Display Manager
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+
+[Service]
+ExecStart=/usr/bin/gdm -nodaemon
+ExecStop=/usr/sbin/gdm-stop
+Restart=always
+
+[Install]
+Alias=display-manager.service
diff --git a/sys-apps/systemd-units/files/services-desktop/gdm_at.service b/sys-apps/systemd-units/files/services-desktop/gdm_at.service
deleted file mode 100644
index ce9e789..0000000
--- a/sys-apps/systemd-units/files/services-desktop/gdm_at.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Gnome Display Manager on %I
-Requires=dev-%i.device
-After=dev-%i.device systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/bin/gdm -nodaemon
-ExecStop=/usr/sbin/gdm-stop
-
-[Install]
-Alias=graphical.target.wants/gdm@tty7.service
diff --git a/sys-apps/systemd-units/files/services-desktop/slim.service b/sys-apps/systemd-units/files/services-desktop/slim.service
new file mode 100644
index 0000000..6311528
--- /dev/null
+++ b/sys-apps/systemd-units/files/services-desktop/slim.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=SLiM Simple Login Manager
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/slim -nodaemon
+
+[Install]
+Alias=display-manager.service
diff --git a/sys-apps/systemd-units/files/services-desktop/slim_at.service b/sys-apps/systemd-units/files/services-desktop/slim_at.service
deleted file mode 100644
index 698a105..0000000
--- a/sys-apps/systemd-units/files/services-desktop/slim_at.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=SLiM Simple Login Manager on %I
-Requires=dev-%i.device
-After=dev-%i.device systemd-user-sessions.service
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/slim -nodaemon
-
-[Install]
-WantedBy=graphical.target