display-manager: fix argument handling of sddm #23264
Closed
Conversation
This file contains 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
previously session type was not correctly set
Mic92
added
2.status: work-in-progress
9.needs: port to stable
|
@Mic92, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edolstra, @rickynils and @nbp to be potential reviewers. |
|
Still a WIP? |
Mic92
referenced
this pull request
Apr 7, 2017
For whatever reason, the OCR code is not detecting ALICE but is BOB. OCR output from login screen (blank lines omitted): > Session none + icewm > 08:41 < > Thursday, April 6, 2017 > BOB FOOBAR > Select your user and enter password
ghost
mentioned this pull request
primeos
approved these changes
Apr 17, 2017
| @@ -32,8 +32,14 @@ let | |||
| '' | |||
| #! ${pkgs.bash}/bin/bash | |||
|
|
|||
| # Handle being called by SDDM. | |||
| if test "''${1:0:1}" = / ; then eval exec $1 $2 ; fi | |||
| # SSDM splits "Exec" line in .desktop file by whitespace and pass script path as $1 | |||
edolstra
added a commit
that referenced
this pull request
Apr 22, 2017
This reverts commit 40a5498. It breaks slim: Apr 22 21:04:23 hagbard xsession[1037]: /nix/store/bw00yl4yspl3wlyiwk56bi0hljjr00di-xsession: Window manager '/nix/store/bw00yl4yspl3wlyiwk56bi0hljjr00di-xsession 'xfce'' not found. Apr 22 21:04:23 hagbard xsession[1037]: /nix/store/bw00yl4yspl3wlyiwk56bi0hljjr00di-xsession: Desktop manager '/nix/store/bw00yl4yspl3wlyiwk56bi0hljjr00di-xsession 'xfce'' not found. Issue #23264.
|
I reverted this on the 17.03 branch because it breaks slim: 99dfb6d. |
|
@edolstra That's unfortunate... Does it break slim on the master branch as well (IIRC slim doesn't get any updates anymore)? And do we know the exact xsession parameters when called from slim? Regarding my setup: For some very strange reason SDDM stopped providing any parameters (only $0 (obviously)) when calling the xsession script. I have no idea how this could happen (I don't remember changing my configuration or nixpkgs). In order to see the parameters I've inserted: >&2 echo "xsession-parameter:"
>&2 echo "$0"
while [ $# -ge 1 ]; do
>&2 echo "$1"
shift
done
>&2 echo "xsession-parameter(end)"At the following file: # file provided by services.xserver.displayManager.session.script
xsession = wm: dm: pkgs.writeScript "xsession"
''
#! ${pkgs.bash}/bin/bashOutput from But it looks like the script should've been called with parameters: |
primeos
added a commit
that referenced
this pull request
Apr 23, 2017
This reverts commit 6b7c5ba. Unfortunately it seems like this broke slim, lightdm and gdm (see #25068 and #23264). This is already reverted in the 17.03 branch (99dfb6d). TODO: We need tests for slim and lightdm and fix the test for gdm (failing since 2016-10-26) to prevent such breakage in the future.
|
I just noticed that we're actually using the wrong quoting within our desktop entry files. #25138 should fix that (but in order to test this I need to fix my other bug first). This might fix this SDDM issue as well. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation for this change
previously session type was not correctly set.
Currently only tested with session type 'none + awesome wm' and ssdm.
Other combinations should be handled in the same way, but for
critical components like login manager, be better safe then sorry
TODO:
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)