diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-17 11:02:12 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-17 11:02:12 -0400 |
| commit | 7d958dcdd109f7b9bf1fd0eb335ac2ab3b116fb0 (patch) | |
| tree | fcef6e630a992eb7b78e959e8dda713019f8390e /modules/services | |
| parent | f903a3dcc80c4bad08dab1474b76c461c7f668a1 (diff) | |
| download | nixlib-7d958dcdd109f7b9bf1fd0eb335ac2ab3b116fb0.tar nixlib-7d958dcdd109f7b9bf1fd0eb335ac2ab3b116fb0.tar.gz nixlib-7d958dcdd109f7b9bf1fd0eb335ac2ab3b116fb0.tar.bz2 nixlib-7d958dcdd109f7b9bf1fd0eb335ac2ab3b116fb0.tar.lz nixlib-7d958dcdd109f7b9bf1fd0eb335ac2ab3b116fb0.tar.xz nixlib-7d958dcdd109f7b9bf1fd0eb335ac2ab3b116fb0.tar.zst nixlib-7d958dcdd109f7b9bf1fd0eb335ac2ab3b116fb0.zip | |
Drop Upstart references
Diffstat (limited to 'modules/services')
| -rw-r--r-- | modules/services/networking/wpa_supplicant.nix | 6 | ||||
| -rw-r--r-- | modules/services/x11/display-managers/kdm.nix | 4 | ||||
| -rw-r--r-- | modules/services/x11/display-managers/slim.nix | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix index 5dc203fd177f..c6b7df38fcfc 100644 --- a/modules/services/networking/wpa_supplicant.nix +++ b/modules/services/networking/wpa_supplicant.nix @@ -45,8 +45,8 @@ in description = '' The interfaces <command>wpa_supplicant</command> will use. If empty, it will automatically use all wireless interfaces. (Note that auto-detection is currently - broken on Linux 3.4.x kernels. See http://github.com/NixOS/nixos/issues/10 for - further details.) + broken on Linux 3.4.x kernels. See http://github.com/NixOS/nixos/issues/10 for + further details.) ''; }; @@ -122,7 +122,7 @@ in powerManagement.resumeCommands = '' - ${config.system.build.upstart}/sbin/restart wpa_supplicant + ${config.system.build.systemd}/bin/systemctl try-restart wpa_supplicant ''; assertions = [{ assertion = !cfg.userControlled.enable || cfg.interfaces != []; diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix index ec4d033a597f..1699ad6343d3 100644 --- a/modules/services/x11/display-managers/kdm.nix +++ b/modules/services/x11/display-managers/kdm.nix @@ -12,8 +12,8 @@ let defaultConfig = '' [Shutdown] - HaltCmd=${config.system.build.upstart}/sbin/halt - RebootCmd=${config.system.build.upstart}/sbin/reboot + HaltCmd=${config.system.build.systemd}/sbin/halt + RebootCmd=${config.system.build.systemd}/sbin/reboot ${optionalString (config.system.boot.loader.id == "grub") '' BootManager=${if config.boot.loader.grub.version == 2 then "Grub2" else "Grub"} ''} diff --git a/modules/services/x11/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix index fc4df80d810a..fbd899b9a95c 100644 --- a/modules/services/x11/display-managers/slim.nix +++ b/modules/services/x11/display-managers/slim.nix @@ -14,8 +14,8 @@ let xserver_arguments ${dmcfg.xserverArgs} sessions ${pkgs.lib.concatStringsSep "," (dmcfg.session.names ++ ["custom"])} login_cmd exec ${pkgs.stdenv.shell} ${dmcfg.session.script} "%session" - halt_cmd ${config.system.build.upstart}/sbin/shutdown -h now - reboot_cmd ${config.system.build.upstart}/sbin/shutdown -r now + halt_cmd ${config.system.build.systemd}/sbin/shutdown -h now + reboot_cmd ${config.system.build.systemd}/sbin/shutdown -r now ${optionalString (cfg.defaultUser != "") ("default_user " + cfg.defaultUser)} ${optionalString cfg.hideCursor "hidecursor true"} ${optionalString cfg.autoLogin "auto_login yes"} |