Revert "display-manager: fix argument handling of sddm"
This reverts commit 6b7c5ba535
.
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.
This commit is contained in:
parent
e019978d02
commit
e1244f6e8a
|
@ -32,14 +32,8 @@ let
|
|||
''
|
||||
#! ${pkgs.bash}/bin/bash
|
||||
|
||||
# SDDM splits "Exec" line in .desktop file by whitespace and pass script path as $1
|
||||
if [[ "$0" = "$1" ]]; then
|
||||
# remove superfluous $1 again
|
||||
shift
|
||||
# join arguments again and evaluate them in a shell context
|
||||
# to interpret shell quoting
|
||||
eval exec "$0" "$@"
|
||||
fi
|
||||
# Handle being called by SDDM.
|
||||
if test "''${1:0:1}" = / ; then eval exec $1 $2 ; fi
|
||||
|
||||
${optionalString cfg.displayManager.logToJournal ''
|
||||
if [ -z "$_DID_SYSTEMD_CAT" ]; then
|
||||
|
|
Loading…
Reference in a new issue