summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJinkun Jang <jinkun.jang@samsung.com>2013-03-15 16:18:34 (GMT)
committerJinkun Jang <jinkun.jang@samsung.com>2013-03-15 16:18:34 (GMT)
commit45698daf3f79496f5aa140df2b4901c00aa62eda (patch)
tree2c63d7e93a0a9bb603cb0b698280b04bc3886db8
parent2f610de82bf66fc17bb3b9772ebe0df4fbefaad2 (diff)
downloadtizen-mobile-session-45698daf3f79496f5aa140df2b4901c00aa62eda.zip
tizen-mobile-session-45698daf3f79496f5aa140df2b4901c00aa62eda.tar.gz
tizen-mobile-session-45698daf3f79496f5aa140df2b4901c00aa62eda.tar.bz2
-rw-r--r--packaging/tizen-generate-env.service11
-rw-r--r--packaging/tizen-mobile-session.spec19
-rw-r--r--packaging/user-session@.service2
3 files changed, 21 insertions, 11 deletions
diff --git a/packaging/tizen-generate-env.service b/packaging/tizen-generate-env.service
new file mode 100644
index 0000000..f963a38
--- /dev/null
+++ b/packaging/tizen-generate-env.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Generate environment from /etc/profile.d
+DefaultDependencies=no
+Before=basic.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/env -i sh -c 'source /etc/profile; env | egrep -v "^(HOME|PWD|SHLVL|_)=" > /run/tizen-mobile-ui'
+
+[Install]
+WantedBy=basic.target
diff --git a/packaging/tizen-mobile-session.spec b/packaging/tizen-mobile-session.spec
index f96399f..46fddeb 100644
--- a/packaging/tizen-mobile-session.spec
+++ b/packaging/tizen-mobile-session.spec
@@ -8,8 +8,9 @@ Source0: tizen-mobile-session.target
Source1: tizen-middleware.target
Source2: user-session@.service
Source3: systemd-user-session
+Source4: tizen-generate-env.service
-Requires: pkgconfig(systemd)
+Requires: systemd
%description
Target for tizen systemd user session
@@ -19,25 +20,21 @@ Target for tizen systemd user session
mkdir -p %{buildroot}%{_libdir}/systemd/user/tizen-mobile-session.target.wants
mkdir -p %{buildroot}%{_libdir}/systemd/user/tizen-middleware.target.wants
mkdir -p %{buildroot}%{_libdir}/systemd/system/graphical.target.wants
+mkdir -p %{buildroot}%{_libdir}/systemd/system/basic.target.wants
install -m 0644 %SOURCE0 %{buildroot}%{_libdir}/systemd/user/
install -m 0644 %SOURCE1 %{buildroot}%{_libdir}/systemd/user/
install -m 0644 %SOURCE2 %{buildroot}%{_libdir}/systemd/system/
+install -m 0644 %SOURCE4 %{buildroot}%{_libdir}/systemd/system/
+
ln -sf ../user-session@.service %{buildroot}%{_libdir}/systemd/system/graphical.target.wants/user-session@app.service
ln -sf tizen-mobile-session.target %{buildroot}%{_libdir}/systemd/user/default.target
+ln -sf ../tizen-generate-env.service %{buildroot}%{_libdir}/systemd/system/basic.target.wants
mkdir -p %{buildroot}%{_sysconfdir}/pam.d
install -m 644 %SOURCE3 %{buildroot}%{_sysconfdir}/pam.d/
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
-cat > %{buildroot}%{_sysconfdir}/sysconfig/tizen-mobile-ui << EOF
-ECORE_IMF_MODULE=isf
-ELM_MODULES=ctxpopup_copypasteUI>entry/api:datetime_input_ctxpopup>datetime/api:object_dump>win/api
-ELM_PROFILE=mobile
-EVAS_FONT_DPI=72
-XMODIFIERS=@im=SCIM
-MULTISENSE_SND_PLAYER=tizen_snd_player
-TIZEN_DEBUG_LEVEL=1
-EOF
+ln -sf /run/tizen-mobile-ui %{buildroot}%{_sysconfdir}/sysconfig/tizen-mobile-ui
%files
@@ -50,3 +47,5 @@ EOF
%{_libdir}/systemd/user/default.target
%{_libdir}/systemd/system/graphical.target.wants/user-session@app.service
%{_libdir}/systemd/system/user-session@.service
+%{_libdir}/systemd/system/tizen-generate-env.service
+%{_libdir}/systemd/system/basic.target.wants/tizen-generate-env.service
diff --git a/packaging/user-session@.service b/packaging/user-session@.service
index 7a9f58e..942a639 100644
--- a/packaging/user-session@.service
+++ b/packaging/user-session@.service
@@ -7,7 +7,7 @@
[Unit]
Description=User Manager for %I
-After=systemd-user-sessions.service
+After=systemd-user-sessions.service dbus.service
[Service]
User=%I