Author: eelco Date: Sat Mar 17 19:22:22 2012 New Revision: 33215 URL: https://nixos.org/websvn/nix/?rev=33215&sc=1
Log: * Improve some job names. Modified: nixos/trunk/modules/services/x11/xserver.nix nixos/trunk/modules/tasks/scsi-link-power-management.nix Modified: nixos/trunk/modules/services/x11/xserver.nix ============================================================================== --- nixos/trunk/modules/services/x11/xserver.nix Sat Mar 17 19:12:33 2012 (r33214) +++ nixos/trunk/modules/services/x11/xserver.nix Sat Mar 17 19:22:22 2012 (r33215) @@ -384,16 +384,15 @@ environment.pathsToLink = [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ]; - jobs.check_for_xserver_start = + jobs."xserver-start-check" = { startOn = if cfg.autorun then "filesystem and stopped udevtrigger" else ""; stopOn = ""; task = true; - script = "grep -qv noX11 /proc/cmdline && initctl emit start_xserver || true"; + script = "grep -qv noX11 /proc/cmdline && start xserver || true"; }; jobs.xserver = - { startOn = "start_xserver"; - environment = + { environment = { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension. TZ = config.time.timeZone; Modified: nixos/trunk/modules/tasks/scsi-link-power-management.nix ============================================================================== --- nixos/trunk/modules/tasks/scsi-link-power-management.nix Sat Mar 17 19:12:33 2012 (r33214) +++ nixos/trunk/modules/tasks/scsi-link-power-management.nix Sat Mar 17 19:22:22 2012 (r33215) @@ -24,7 +24,7 @@ config = mkIf (config.powerManagement.scsiLinkPolicy != "") { - jobs.scsilinkpmpolicy = + jobs."scsi-link-pm" = { description = "Set SCSI link power management policy"; startOn = "started udev"; _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits