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

Fix sleep workaround with Xorg #55

Merged
merged 1 commit into from
Nov 20, 2024
Merged

Fix sleep workaround with Xorg #55

merged 1 commit into from
Nov 20, 2024

Conversation

jikortus
Copy link
Contributor

I didn't realize gnome-kiosk is actually used even with Xorg, so the sleep workaround wouldn't actually apply at all. Grepping for Xorg instead should be bulletproof.

@jikortus jikortus requested a review from jstodola November 19, 2024 13:18
@@ -12,7 +12,7 @@ ConditionArchitecture=!s390x
# It seems the delay shouldn't be needed with Wayland (and/or with the new version
# of dogtail). If it turns out it's not the case, we should remove the sleep
# from here and implement it it launcher.py.
ExecStartPre=sh -c "ps aux | grep -q gnome-kiosk || sleep 30"
ExecStartPre=sh -c "ps aux | grep -q Xorg && sleep 30"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Actually, this might still be problematic, for example when an application is executed with a possible --no-Xorg argument.
What about using which Xorg instead of listing running processes?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for having a look, that's actually a good point. Fixed.

I didn't realize gnome-kiosk is actually used even with Xorg, so
the sleep workaround wouldn't actually apply at all. Grepping
for Xorg instead should be bulletproof.
@jikortus jikortus force-pushed the xorg-sleep-workaround-fix branch from 3a9b0a9 to 062cff6 Compare November 19, 2024 15:19
Copy link
Collaborator

@jstodola jstodola left a comment

Choose a reason for hiding this comment

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

It looks good to me.

@jikortus jikortus merged commit 1afa9d5 into main Nov 20, 2024
1 of 3 checks passed
@jikortus jikortus deleted the xorg-sleep-workaround-fix branch November 20, 2024 10:50
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.

2 participants