Drop Upstart references
This commit is contained in:
parent
f903a3dcc8
commit
7d958dcdd1
modules/services
|
@ -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 != [];
|
||||
|
|
|
@ -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"}
|
||||
''}
|
||||
|
|
|
@ -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"}
|
||||
|
|
Loading…
Reference in New Issue