Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[yamuisplash] Adapt to yamui changes. Fixes JB#59812 #3

Merged
merged 1 commit into from Feb 16, 2023

Conversation

spiiroin
Copy link
Contributor

Yamui has been modified so that it is systemd aware and implements compositor D-Bus service.

Switch yamuisplash systemd service type from simple to notify, and remove the not really necessary start script.

As yamui will now automatically exit when the next UI wants to take over display, systemd drop-ins that were used for explicitly stopping splashscreen service can be removed.

Signed-off-by: Simo Piiroinen simo.piiroinen@jolla.com

@Thaodan
Copy link
Contributor

Thaodan commented Jan 30, 2023 via email

@spiiroin
Copy link
Contributor Author

/run is available after the rootfs is mounted. /run/yamui can be created with tmpfiles.d or RuntimeDirectory inside yamui.service.

So, actually /run is available a bit earlier than /tmp - which means using it would be a good thing.

I think tmpfiles.d is out because waiting for systemd-tmpfiles-setup.service would incur about 2 second delay for showing the splascreen.

RuntimeDirectory should work (but given the purpose, needs RuntimeDirectoryPreserve=yes too).

Need to test that (and dropping flagfile use altogether too).

@spiiroin
Copy link
Contributor Author

spiiroin commented Feb 7, 2023

Review commits squashed

Copy link
Contributor

@Thaodan Thaodan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Yamui has been modified so that it is systemd aware and implements
compositor D-Bus service.

Switch yamuisplash systemd service type from simple to notify, and
remove the not really necessary start script.

As yamui will now automatically exit when the next UI wants to
take over display, systemd drop-ins that were used for explicitly
stopping splashscreen service can be removed.

Move flagfile from /tmp to /run and remove After=tmp.mount.

Add Conflicts/Before=shutdown.target as is recommended for services
that utilize DefaultDependencies=no.

As yamui gets executed and grabs display well before droid hal init
has a chance to start android hw composer, there is no need for
explicit delay and thus Before=droid-hal-init.service can be removed.

However, in order to ensure deterministic display ownership transfer,
unlock agent and user session need to wait until yamui is ready.

Uses features that are available in yamui >= 1.2.0

Signed-off-by: Simo Piiroinen <simo.piiroinen@jolla.com>
@spiiroin
Copy link
Contributor Author

Removed Before=droid-hal-init.service
Added Conflicts/Before=shutdown.target
Commit message updated.

@spiiroin spiiroin merged commit 270de78 into sailfishos:master Feb 16, 2023
@spiiroin spiiroin deleted the jb59812_compositor_extension branch February 16, 2023 11:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants