summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChengwei Yang <chengwei.yang@intel.com>2013-07-30 05:17:03 (GMT)
committerChengwei Yang <chengwei.yang@intel.com>2013-07-30 05:20:23 (GMT)
commit4a40aceceda00f0b954900c9cb6a785ddb7f4439 (patch)
tree65e2271059e911361f080cf85e078de8d589039d
parent45698daf3f79496f5aa140df2b4901c00aa62eda (diff)
downloadtizen-mobile-session-4a40aceceda00f0b954900c9cb6a785ddb7f4439.zip
tizen-mobile-session-4a40aceceda00f0b954900c9cb6a785ddb7f4439.tar.gz
tizen-mobile-session-4a40aceceda00f0b954900c9cb6a785ddb7f4439.tar.bz2
This is needed to reflect changes in newer systemd. Based on Maciej Wereski change and with fix of cgroup path. Change-Id: I573e2b428a38d89bea8fe6c77a8dcc42e726ff0e Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
-rw-r--r--packaging/tizen-mobile-session.changes3
-rw-r--r--packaging/tizen-mobile-session.spec2
-rw-r--r--packaging/user-session@.service6
3 files changed, 7 insertions, 4 deletions
diff --git a/packaging/tizen-mobile-session.changes b/packaging/tizen-mobile-session.changes
index f19e805..0d8b231 100644
--- a/packaging/tizen-mobile-session.changes
+++ b/packaging/tizen-mobile-session.changes
@@ -1,3 +1,6 @@
+* Wed Jun 26 2013 Maciej Wereski <m.wereski@partner.samsung.com>
+- Use UID instead of username vars in paths
+
* Wed Jul 11 2012 Patrick McCarty <patrick.mccarty@linux.intel.com> c5e7eba
- Update module list for ELM_MODULES, required for date/time settings
diff --git a/packaging/tizen-mobile-session.spec b/packaging/tizen-mobile-session.spec
index 46fddeb..f31b5d8 100644
--- a/packaging/tizen-mobile-session.spec
+++ b/packaging/tizen-mobile-session.spec
@@ -1,7 +1,7 @@
Name: tizen-mobile-session
Summary: Target for tizen systemd user session
Version: 1
-Release: 1
+Release: 2
Group: System/Libraries
License: Public Domain
Source0: tizen-mobile-session.target
diff --git a/packaging/user-session@.service b/packaging/user-session@.service
index 942a639..3f06862 100644
--- a/packaging/user-session@.service
+++ b/packaging/user-session@.service
@@ -12,11 +12,11 @@ After=systemd-user-sessions.service dbus.service
[Service]
User=%I
PAMName=systemd-user-session
-ControlGroup=%R/user/%I/shared cpu:/
+ControlGroup=%R/user/%U.user/shared cpu:/
ControlGroupModify=yes
Type=notify
ExecStart=-/usr/lib/systemd/systemd --user
-Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/dbus/user_bus_socket
+Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%U/dbus/user_bus_socket
Environment=DISPLAY=:0
-Environment=XDG_RUNTIME_DIR=/run/user/%I
+Environment=XDG_RUNTIME_DIR=/run/user/%U
EnvironmentFile=/etc/sysconfig/tizen-mobile-ui