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

* Improve some job names.

Browse Source 
svn path=/nixos/trunk/; revision=33215
This commit is contained in:
Eelco Dolstra 2012-03-17 19:22:22 +00:00
parent ee6c9bb998
commit ed436179e1
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/services/x11/xserver.nix
View File

@ -384,16 +384,15 @@ in
environment.pathsToLink = environment.pathsToLink =
[ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ]; [ "/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 ""; { startOn = if cfg.autorun then "filesystem and stopped udevtrigger" else "";
stopOn = ""; stopOn = "";
task = true; task = true;
script = "grep -qv noX11 /proc/cmdline && initctl emit start_xserver || true"; script = "grep -qv noX11 /proc/cmdline && start xserver || true";
}; };
jobs.xserver = jobs.xserver =
{ startOn = "start_xserver"; { environment =
environment =
{ FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension. XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
TZ = config.time.timeZone; TZ = config.time.timeZone;

2
modules/tasks/scsi-link-power-management.nix
View File

@ -24,7 +24,7 @@ with pkgs.lib;
config = mkIf (config.powerManagement.scsiLinkPolicy != "") { config = mkIf (config.powerManagement.scsiLinkPolicy != "") {
jobs.scsilinkpmpolicy = jobs."scsi-link-pm" =
{ description = "Set SCSI link power management policy"; { description = "Set SCSI link power management policy";
startOn = "started udev"; startOn = "started udev";