[systemd-commits] Makefile.am units/frugalware

[root]

 Makefile.am                              |    5 -----
 units/frugalware/display-manager.service |   16 ----------------
 2 files changed, 21 deletions(-)

New commits:
commit 7a14d67f7618787a0b829eb360b41a3889801f74
Author: Tollef Fog Heen <tfheen at err.no>
Date:   Fri Dec 14 09:17:14 2012 +0100

    Remove frugalware display-manager.service
    
    Frugalware are shipping their own .service file now, so stop shipping
    it here.
    
    This effectively reverts 196e3fa74a88a04b0ecec7d3af648287dd088f8a

diff --git a/Makefile.am b/Makefile.am
index f8fe252..429da59 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -422,11 +422,6 @@ systemgenerator_PROGRAMS += \
 	systemd-rc-local-generator
 endif
 
-if TARGET_FRUGALWARE
-dist_systemunit_DATA += \
-	units/frugalware/display-manager.service
-endif
-
 if TARGET_SUSE
 dist_systemunit_DATA += \
 	units/suse/rc-local.service \
diff --git a/units/frugalware/display-manager.service b/units/frugalware/display-manager.service
deleted file mode 100644
index a5c475c..0000000
--- a/units/frugalware/display-manager.service
+++ /dev/null
@@ -1,16 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Display Manager
-After=local.service systemd-user-sessions.service
-
-[Service]
-EnvironmentFile=/etc/sysconfig/desktop
-ExecStart=/bin/bash -c "exec ${desktop}"
-Restart=always
-RestartSec=0