packaging: fix for multi-user

Change-Id: I84525d0b76fe656d79ad724cc7047903807dd773
Signed-off-by: Jussi Laako <jussi.laako@linux.intel.com>

diff --git a/packaging/ac.service b/packaging/ac.service
index aaf20df..24c5cf1 100644 (file)
--- 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 e186c6f..6d1b9b2 100644 (file)
--- a/packaging/aul.spec
+++ b/packaging/aul.spec
@@ -74,25 +74,24 @@ 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
+mkdir -p %{buildroot}%{_unitdir}
+mkdir -p %{buildroot}%{_unitdir_user}
 install -m 0644 %SOURCE102 %{buildroot}%{_unitdir}/ac.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
+    systemctl disable ac
+    systemctl --global disable amd_session_agent
 fi
 
 %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
 
@@ -121,10 +120,8 @@ systemctl daemon-reload
 %{_datadir}/aul/service/*
 %{_datadir}/aul/preload_list.txt
 %{_datadir}/aul/preexec_list.txt
-%{_unitdir}/graphical.target.wants/ac.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