diff options
| author | Alex Wu <zhiwen.wu@linux.intel.com> | 2013-12-09 02:38:09 (GMT) |
|---|---|---|
| committer | Alex Wu <zhiwen.wu@linux.intel.com> | 2013-12-09 03:01:02 (GMT) |
| commit | 9e1de416dfc4c6e0a3ff110b70722b6e9cfef450 (patch) | |
| tree | e3f63acb7f55977196222f328fc9d76201e4999b | |
| parent | 54203f036a79b11f80763918ea1ac40284652e44 (diff) | |
| download | tizen-mobile-session-9e1de416dfc4c6e0a3ff110b70722b6e9cfef450.zip tizen-mobile-session-9e1de416dfc4c6e0a3ff110b70722b6e9cfef450.tar.gz tizen-mobile-session-9e1de416dfc4c6e0a3ff110b70722b6e9cfef450.tar.bz2 | |
v3: Add systemd support for wayland segment.submit/tizen/20131213.101720refs/changes/97/13497/1refs/changes/20/12920/3
Changes from v2:
1. Unconditionally set PAMName=login in user-session@.service.in.
2. Remove systemd-user-session
There is no need to keep two config files (systemd-user-session and login
which is provided by util-linux) in our image with essentialy same PAM
configuration. We use "PAMName=login", since weston-launch need it and it
will not break X image.
Change-Id: I51304aca8bd336db65195be95fe19554a6594100
Signed-off-by: Alex Wu <zhiwen.wu@linux.intel.com>
| -rw-r--r-- | packaging/systemd-user-session | 13 | ||||
| -rw-r--r-- | packaging/tizen-mobile-session.spec | 5 | ||||
| -rw-r--r-- | packaging/user-session@.service.in | 2 |
3 files changed, 1 insertions, 19 deletions
diff --git a/packaging/systemd-user-session b/packaging/systemd-user-session deleted file mode 100644 index 3840e78..0000000 --- a/packaging/systemd-user-session +++ /dev/null @@ -1,13 +0,0 @@ -auth requisite pam_nologin.so -auth [user_unknown=ignore success=ok ignore=ignore default=bad] pam_securetty.so -auth include system-auth -account required pam_nologin.so -account include system-auth -password include system-auth - -session include system-auth -session required pam_loginuid.so -session required pam_namespace.so -session optional pam_keyinit.so force revoke -session optional pam_mkhomedir.so skel=/etc/skel umask=0022 - diff --git a/packaging/tizen-mobile-session.spec b/packaging/tizen-mobile-session.spec index b371b0a..a7bf0a8 100644 --- a/packaging/tizen-mobile-session.spec +++ b/packaging/tizen-mobile-session.spec @@ -8,7 +8,6 @@ License: Public Domain Source0: tizen-mobile-session.target Source1: tizen-middleware.target Source2: user-session@.service.in -Source3: systemd-user-session Source4: tizen-generate-env.service Requires: systemd @@ -46,16 +45,12 @@ ln -sf ../user-session@.service %{buildroot}%{_libdir}/systemd/system/graphical. 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 ln -sf /run/tizen-mobile-ui %{buildroot}%{_sysconfdir}/sysconfig/tizen-mobile-ui %files %config %{_sysconfdir}/sysconfig/tizen-mobile-ui -%config %{_sysconfdir}/pam.d/systemd-user-session %{_libdir}/systemd/user/tizen-mobile-session.target %{_libdir}/systemd/user/tizen-middleware.target %{_libdir}/systemd/user/tizen-mobile-session.target.wants/ diff --git a/packaging/user-session@.service.in b/packaging/user-session@.service.in index 4815433..b9646fa 100644 --- a/packaging/user-session@.service.in +++ b/packaging/user-session@.service.in @@ -12,7 +12,7 @@ After=systemd-user-sessions.service dbus.service [Service] User=%I -PAMName=systemd-user-session +PAMName=login ControlGroup=%R/user/%U.user/shared cpu:/ ControlGroupModify=yes Type=notify |