public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop Upstart references

This commit is contained in:
Eelco Dolstra 2012-08-17 11:02:12 -04:00
parent f903a3dcc8
commit 7d958dcdd1
3 changed files with 7 additions and 7 deletions
modules/services
networking
wpa_supplicant.nix
x11/display-managers
kdm.nixslim.nix

2
modules/services/networking/wpa_supplicant.nix
View File

@ -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 != [];

4
modules/services/x11/display-managers/kdm.nix
View File

@ -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"}
''}

4
modules/services/x11/display-managers/slim.nix
View File

@ -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"}