-
-
Notifications
You must be signed in to change notification settings - Fork 7
Add systemd support #55
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,3 +11,7 @@ endif | |
|
|
||
| subdir('session') | ||
| subdir('xsessions') | ||
|
|
||
| if get_option('systemd') | ||
| subdir('systemd') | ||
| endif | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| [Unit] | ||
| Description=GNOME X11 Session (session: %i) | ||
| OnFailure=gnome-session-failed.target | ||
| OnFailureJobMode=replace | ||
| DefaultDependencies=no | ||
| # Start happens explicitly | ||
| RefuseManualStart=no | ||
| # Stop happens by starting gnome-session-shutdown.target | ||
| #RefuseManualStop=yes | ||
|
|
||
| Conflicts=shutdown.target gnome-session-shutdown.target | ||
| PartOf=graphical-session.target | ||
|
|
||
| # As this is the main entry point, pull in the other toplevel gnome-session targets | ||
| BindsTo=gnome-session@.target | ||
| After=gnome-session@.target | ||
|
|
||
| BindsTo=pantheon-session-x11.target | ||
| After=pantheon-session-x11.target | ||
|
|
||
| BindsTo=gnome-session.target | ||
| After=gnome-session.target | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| dep_systemd = dependency('systemd', required: true) | ||
| systemd_userunitdir = dep_systemd.get_pkgconfig_variable('systemduserunitdir') | ||
|
|
||
| install_data( | ||
| 'gnome-session-x11@pantheon.target', | ||
| install_dir: systemd_userunitdir | ||
| ) | ||
|
|
||
| install_data( | ||
| 'pantheon-session-x11.target', | ||
| install_dir: systemd_userunitdir | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| [Unit] | ||
| Description=Pantheon X11 Session | ||
| # On X11, try to show the fail screen | ||
| OnFailure=gnome-session-failed.target | ||
| OnFailureJobMode=replace | ||
| # Avoid default After/Before rules | ||
| DefaultDependencies=no | ||
|
|
||
| Before=gnome-session.target | ||
|
|
||
| PartOf=graphical-session.target | ||
| RefuseManualStart=yes | ||
| RefuseManualStop=yes | ||
|
|
||
| # Pull in all X11-specific services the session might depend on | ||
| Requires=gnome-session-x11-services.target | ||
|
|
||
| # Pull in the correct gala target | ||
| BindsTo=gala-x11.target | ||
| After=gala-x11.target |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we remove this comments before merging?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These unit files are just direct copies of the ones from
gnome-session, just tweaked where necessary to make it run pantheon instead and these lines come from there. It seems nicer to keep them as similar as possible to thegnome-sessionones so we can see the diff if necessary.