summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTollef Fog Heen <tfheen@err.no>2012-12-14 09:17:14 +0100
committerTollef Fog Heen <tfheen@err.no>2012-12-14 09:17:14 +0100
commit7a14d67f7618787a0b829eb360b41a3889801f74 (patch)
tree9c8eac301b117f24b20585f489c6dbe66a3d070c
parent6b2b6f30e38d67b032d6bdc6b47ae05e143e96c5 (diff)
Remove frugalware display-manager.service
Frugalware are shipping their own .service file now, so stop shipping it here. This effectively reverts 196e3fa74a88a04b0ecec7d3af648287dd088f8a
-rw-r--r--Makefile.am5
-rw-r--r--units/frugalware/display-manager.service16
2 files changed, 0 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am
index f8fe2529ab..429da59ee7 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 a5c475cd9e..0000000000
--- 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