Merge lp://qastaging/~mterry/unity8/session-lightdm into lp://qastaging/unity8
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~mterry/unity8/session-lightdm |
| Merge into: | lp://qastaging/unity8 |
| Diff against target: |
3515 lines (+329/-1997) 66 files modified
CMakeLists.txt (+1/-0) cmake/modules/QmlTest.cmake (+3/-3) data/unity8.conf (+12/-12) debian/rules (+1/-3) plugins/AccountsService/AccountsService.cpp (+27/-1) plugins/AccountsService/AccountsService.h (+8/-0) plugins/LightDM/CMakeLists.txt (+16/-8) plugins/LightDM/FullLightDM/CMakeLists.txt (+0/-32) plugins/LightDM/IntegratedLightDM/CMakeLists.txt (+0/-33) plugins/LightDM/IntegratedLightDM/QLightDM/Greeter (+0/-17) plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModel (+0/-17) plugins/LightDM/IntegratedLightDM/QLightDM/UsersModel (+0/-17) plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txt (+0/-55) plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp (+0/-182) plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h (+0/-108) plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp (+0/-309) plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h (+0/-52) plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp (+0/-87) plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h (+0/-72) plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp (+0/-36) plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.h (+0/-54) plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpp (+0/-110) plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.h (+0/-66) plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp (+0/-94) plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.h (+0/-72) plugins/LightDM/IntegratedLightDM/qmldir (+0/-3) plugins/LightDM/plugin.cpp (+8/-21) plugins/LightDM/plugin.h (+1/-1) plugins/LightDM/qmldir (+2/-3) plugins/Unity/Session/dbusunitysessionservice.cpp (+3/-45) plugins/Unity/Session/dbusunitysessionservice.h (+0/-3) qml/Components/Dialogs.qml (+5/-5) qml/Greeter/FullLightDMImpl.qml (+0/-31) qml/Greeter/Greeter.qml (+30/-29) qml/Greeter/IntegratedLightDMImpl.qml (+0/-30) qml/Greeter/LightDMService.qml (+0/-54) qml/Greeter/LoginList.qml (+9/-9) qml/Greeter/NarrowView.qml (+1/-1) qml/Greeter/PromptList.qml (+7/-7) qml/Greeter/SessionsList.qml (+4/-4) qml/Greeter/WideView.qml (+2/-2) qml/Greeter/qmldir (+0/-1) qml/Shell.qml (+8/-1) tests/mocks/AccountsService/AccountsService.cpp (+14/-0) tests/mocks/AccountsService/AccountsService.h (+8/-0) tests/mocks/AccountsService/CMakeLists.txt (+5/-1) tests/mocks/libusermetrics/UserMetrics.cpp (+3/-5) tests/plugins/AccountsService/AccountsServer.cpp (+11/-0) tests/plugins/AccountsService/AccountsServer.h (+5/-0) tests/plugins/AccountsService/client.cpp (+71/-21) tests/plugins/AccountsService/interfaces.xml (+1/-0) tests/plugins/LightDM/CMakeLists.txt (+33/-107) tests/plugins/LightDM/IntegratedLightDM/integrated.cpp (+0/-88) tests/plugins/LightDM/IntegratedLightDM/pam.cpp (+0/-54) tests/plugins/LightDM/dbus.cpp (+1/-1) tests/plugins/LightDM/greeter.qml (+1/-1) tests/plugins/Unity/Session/sessionbackendtest.cpp (+0/-1) tests/qmltests/Dash/tst_DashShell.qml (+1/-1) tests/qmltests/Greeter/tst_Greeter.qml (+8/-8) tests/qmltests/Greeter/tst_Infographics.qml (+1/-1) tests/qmltests/Greeter/tst_NarrowView.qml (+4/-4) tests/qmltests/Greeter/tst_WideView.qml (+7/-7) tests/qmltests/Tutorial/tst_Tutorial.qml (+1/-1) tests/qmltests/tst_OrientedShell.qml (+1/-1) tests/qmltests/tst_Shell.qml (+4/-4) tests/qmltests/tst_ShellWithPin.qml (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~mterry/unity8/session-lightdm |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Josh Arenson | Pending | ||
| Unity8 CI Bot | continuous-integration | Pending | |
| Albert Astals Cid | Pending | ||
|
Review via email:
|
|||
Commit message
Use liblightdm for session lockscreen too.
This lets us switch users directly from the lockscreen, rather than going to the system greeter.
Description of the change
This is mostly simplification.
- I drop the distinction between FullLightDM and IntegratedLightDM. Now we always use the full lightdm experience. This lets us drop our custom PAM and custom user code in IntegratedLightDM. No more support for ~/.unity8-
- I add a "greeterMode" property to our AccountsService plugin. This toggles whether we try to write non-active user properties back to the system AccountsService daemon or not. When running in-session, we don't want to. We don't have permission to anyway, and it doesn't really matter for the properties we change (notably, the FailedLogins count -- we can just keep track of that locally. It's not urgent that we write that to disk in this case.)
As part of landing, we should backport lightdm from yakkety. Silo 1679 has this MP, a backported lightdm, and the related branches listed below.
FIXME: this needs some more work:
- Needs re-testing after some big merges from trunk that I've done.
- It seems to cause (exacerbate?) a crash when switching between sessions, something to do with VT switches failing...?
- Needs some security work to tag unity8 with an apparmor label and have liblightdm only allow in-session connections that have that label.
======
* Are there any related MPs required for this MP to build/function as expected? Please list.
Yes. Two config changes to enable this new mode:
- https:/
- https:/
And a backported yakkety lightdm.
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
I'm on the team.
* If you changed the UI, has there been a design review?
NA
Unmerged revisions
- 2799. By Michael Terry
-
Drop IntegratedLightDM and always use system liblightdm instead
