From 68ea127eeb0300e3b3e2ff1bf37af7a91b89dce4 Mon Sep 17 00:00:00 2001
From: Jussi Laako <jussi.laako@linux.intel.com>
Date: Tue, 7 Oct 2014 17:40:14 +0300
Subject: packaging: fix for multi-user

---
 packaging/ac.service |  2 +-
 packaging/aul.spec   | 19 ++++++-------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/packaging/ac.service b/packaging/ac.service
index aaf20df7..24c5cf18 100644
--- a/packaging/ac.service
+++ b/packaging/ac.service
@@ -14,4 +14,4 @@ ExecStart=/usr/bin/amd
 OOMScoreAdjust=-100
 
 [Install]
-WantedBy=graphical.target
+WantedBy=default.target
diff --git a/packaging/aul.spec b/packaging/aul.spec
index f1830112..9bf38015 100644
--- a/packaging/aul.spec
+++ b/packaging/aul.spec
@@ -5,7 +5,6 @@ Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source101:  launchpad-preload@.service
 Source102:  ac.service
 Source103:  amd_session_agent.service
 Source1001: %{name}.manifest
@@ -75,27 +74,25 @@ mkdir -p %{buildroot}%{TZ_SYS_DB}
 sqlite3 %{buildroot}%{TZ_SYS_DB}/.mida.db < %{buildroot}%{_datadir}/aul/mida_db.sql
 rm -rf %{buildroot}%{_datadir}/aul/mida_db.sql
 
-mkdir -p %{buildroot}%{_unitdir}/graphical.target.wants
-mkdir -p %{buildroot}%{_unitdir_user}/default.target.wants
-install -m 0644 %SOURCE101 %{buildroot}%{_unitdir}/launchpad-preload@.service
+mkdir -p %{buildroot}%{_unitdir}
+mkdir -p %{buildroot}%{_unitdir_user}
 install -m 0644 %SOURCE102 %{buildroot}%{_unitdir}/ac.service
-ln -s ../launchpad-preload@.service %{buildroot}%{_unitdir}/graphical.target.wants/launchpad-preload@5000.service
-ln -s ../ac.service %{buildroot}%{_unitdir}/graphical.target.wants/ac.service
 
 install -m 0644 %SOURCE103 %{buildroot}%{_unitdir_user}/amd_session_agent.service
-ln -s ../amd_session_agent.service %{buildroot}%{_unitdir_user}/default.target.wants/amd_session_agent.service
 
 %preun
 if [ $1 == 0 ]; then
-    systemctl stop launchpad-preload@5000.service
     systemctl stop ac.service
 fi
+systemctl disable ac
+systemctl --global disable amd_session_agent
 
 %post
 /sbin/ldconfig
+systemctl enable ac
+systemctl --global enable amd_session_agent
 systemctl daemon-reload
 if [ $1 == 1 ]; then
-    systemctl restart launchpad-preload@5000.service
     systemctl restart ac.service
 fi
 
@@ -124,12 +121,8 @@ systemctl daemon-reload
 %{_datadir}/aul/service/*
 %{_datadir}/aul/preload_list.txt
 %{_datadir}/aul/preexec_list.txt
-%{_unitdir}/graphical.target.wants/launchpad-preload@5000.service
-%{_unitdir}/graphical.target.wants/ac.service
-%{_unitdir}/launchpad-preload@.service
 %{_unitdir}/ac.service
 %{_unitdir_user}/amd_session_agent.service
-%{_unitdir_user}/default.target.wants/amd_session_agent.service
 %{_bindir}/amd
 %{_bindir}/daemon-manager-release-agent
 %{_bindir}/daemon-manager-launch-agent
-- 
cgit v1.2.3