From d7406769acd06fbd83ab066da9a0fca985f71c2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 22 Apr 2010 13:56:26 +0000
Subject: [PATCH] Making /var/run/utmp writable by the 'utmp' group. Then,
 people can choose a setgid utmp for their xterm, konsole or whatever to get
 the terminals reported there.

svn path=/nixos/trunk/; revision=21238
---
 modules/config/users-groups.nix                 | 3 +++
 modules/misc/ids.nix                            | 1 +
 modules/system/activation/activation-script.nix | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index 72d3e21f2039..cb84117090be 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -90,6 +90,9 @@ let
           { name = "nixbld";
             gid = ids.gids.nixbld;
           }
+          { name = "utmp";
+            gid = ids.gids.utmp;
+          }
         ];
 
       addAttrs =
diff --git a/modules/misc/ids.nix b/modules/misc/ids.nix
index 87e2eacf9117..041b0badd0ee 100644
--- a/modules/misc/ids.nix
+++ b/modules/misc/ids.nix
@@ -87,6 +87,7 @@ in
     video = 26;
     dialout = 27;
     polkituser = 28;
+    utmp = 29;
     davfs2 = 31;
     privoxy = 32;
     disnix = 33;
diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 21c52abe49f3..b87429008a58 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -79,7 +79,8 @@ let
       mkdir -m 0755 -p /var/run/console # for pam_console
 
       touch /var/run/utmp # must exist
-      chmod 644 /var/run/utmp
+      chgrp ${config.ids.gids.utmp} /var/run/utmp
+      chmod 664 /var/run/utmp
 
       mkdir -m 0755 -p /var/run/nix/current-load # for distributed builds
       mkdir -m 0700 -p /var/run/nix/remote-stores