summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorBenno Fünfstück <benno.fuenfstueck@gmail.com>2016-07-17 18:29:46 +0200
committerBenno Fünfstück <benno.fuenfstueck@gmail.com>2016-07-17 18:54:23 +0200
commitbe625ad36be481e4d0274b489066fe18c147376c (patch)
tree216bd400ddf05df1fc8ccb522ffc76d05565bedc /nixos
parentf5dd6462fb4c91eb9863805a431e9800502c9869 (diff)
downloadnixpkgs-be625ad36be481e4d0274b489066fe18c147376c.tar
nixpkgs-be625ad36be481e4d0274b489066fe18c147376c.tar.gz
nixpkgs-be625ad36be481e4d0274b489066fe18c147376c.tar.bz2
nixpkgs-be625ad36be481e4d0274b489066fe18c147376c.tar.lz
nixpkgs-be625ad36be481e4d0274b489066fe18c147376c.tar.xz
nixpkgs-be625ad36be481e4d0274b489066fe18c147376c.tar.zst
nixpkgs-be625ad36be481e4d0274b489066fe18c147376c.zip
xsession: fix multiple arguments with logToJournal
KDM and LightDM (at least with autologin) call the xsession-script with
two arguments: the first is the path of the xsession script itself,
while the second one are the actual arguments. The line to re-exec the
script under systemd-cat only forwarded a single argument, therefore
breaking LightDM and KDM login. This commit fixes the issue by always
forwarding all the arguments.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/display-managers/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 862ddc1d13f..83d679ebe01 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -34,7 +34,7 @@ let
 
       ${optionalString cfg.displayManager.logToJournal ''
         if [ -z "$_DID_SYSTEMD_CAT" ]; then
-          _DID_SYSTEMD_CAT=1 exec ${config.systemd.package}/bin/systemd-cat -t xsession -- "$0" "$1"
+          _DID_SYSTEMD_CAT=1 exec ${config.systemd.package}/bin/systemd-cat -t xsession -- "$0" "$@"
         fi
       ''}