diff options
| author | Parnell Springmeyer <parnell@awakenetworks.com> | 2016-09-01 19:06:21 -0500 |
|---|---|---|
| committer | Parnell Springmeyer <parnell@awakenetworks.com> | 2016-09-01 19:21:06 -0500 |
| commit | 98c058a1ee338731d72d33f320da48c95fecd0e0 (patch) | |
| tree | fe83f2050163abfe9a73ad36ac1368fbe283cd39 /nixos/modules/services/system | |
| parent | 390ab0b3eff809052d5b9d9b5335413b36898481 (diff) | |
Adapting everything for the merged permissions wrappers work.
Diffstat (limited to 'nixos/modules/services/system')
| -rw-r--r-- | nixos/modules/services/system/dbus.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 8bcd6f01656dc..df93fcd2bdbaa 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -30,7 +30,7 @@ let mkdir -p $out sed '${./dbus-system-local.conf.in}' \ - -e 's,@servicehelper@,${config.security.wrapperDir}/dbus-daemon-launch-helper,g' \ + -e 's,@servicehelper@,${config.security.permissionsWrapperDir}/dbus-daemon-launch-helper,g' \ -e 's,@extra@,${systemExtraxml},' \ > "$out/system-local.conf" @@ -102,9 +102,9 @@ in systemd.packages = [ pkgs.dbus.daemon ]; - security.setuidOwners = singleton + security.permissionsWrappers.setuid = singleton { program = "dbus-daemon-launch-helper"; - source = "${pkgs.dbus_daemon.out}/libexec/dbus-daemon-launch-helper"; + source = "${pkgs.dbus_daemon}/libexec/dbus-daemon-launch-helper"; owner = "root"; group = "messagebus"; setuid = true; |