Skip to content

Commit 8702fd3

Browse files
vcunatvcunat
committedJun 18, 2017
Merge branch 'master' into staging
... to get in more fixes of setuid/setgid.
2 parents 351b59b + 91e08fe commit 8702fd3

File tree

72 files changed

+1023
-711
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1023
-711
lines changed
 

Diff for: ‎nixos/doc/manual/configuration/x-windows.xml

+7
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@ services.xserver.displayManager.lightdm.enable = true;
4545
</programlisting>
4646
</para>
4747

48+
<para>You can set the keyboard layout (and optionally the layout variant):
49+
<programlisting>
50+
services.xserver.layout = "de";
51+
services.xserver.xkbVariant = "neo";
52+
</programlisting>
53+
</para>
54+
4855
<para>The X server is started automatically at boot time. If you
4956
don’t want this to happen, you can set:
5057
<programlisting>

Diff for: ‎nixos/modules/security/wrappers/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ let
8080
group = "root";
8181
} // s)
8282
else if
83-
(s ? "setuid" && s.setuid == true) ||
84-
(s ? "setguid" && s.setguid == true) ||
83+
(s ? "setuid" && s.setuid) ||
84+
(s ? "setgid" && s.setgid) ||
8585
(s ? "permissions")
8686
then mkSetuidProgram s
8787
else mkSetuidProgram

0 commit comments

Comments
 (0)