diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-06-03 08:14:54 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-06-03 08:14:54 +0000 |
| commit | 021c65da98aa6298e0f8c238ddae1a1bb80d6ca5 (patch) | |
| tree | ba127fbd26d6e78c1fe328df65d8ae5a0c900378 /modules/services/x11/xserver/default.nix | |
| parent | 116306c8dc1a91f2cfe6f579e7fe6081940aac14 (diff) | |
| download | nixpkgs-021c65da98aa6298e0f8c238ddae1a1bb80d6ca5.tar nixpkgs-021c65da98aa6298e0f8c238ddae1a1bb80d6ca5.tar.gz nixpkgs-021c65da98aa6298e0f8c238ddae1a1bb80d6ca5.tar.bz2 nixpkgs-021c65da98aa6298e0f8c238ddae1a1bb80d6ca5.tar.lz nixpkgs-021c65da98aa6298e0f8c238ddae1a1bb80d6ca5.tar.xz nixpkgs-021c65da98aa6298e0f8c238ddae1a1bb80d6ca5.tar.zst nixpkgs-021c65da98aa6298e0f8c238ddae1a1bb80d6ca5.zip | |
* Quick hack in the X server job: wait until udev is running, since we
need some devices. In particular this fixes the "Cannot open virtual console 7" errors in VirtualBox. (There's nothing special about VirtualBox, but the different timing makes it more likely to trigger this bug.) svn path=/nixos/branches/modular-nixos/; revision=15836
Diffstat (limited to 'modules/services/x11/xserver/default.nix')
| -rw-r--r-- | modules/services/x11/xserver/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/modules/services/x11/xserver/default.nix b/modules/services/x11/xserver/default.nix index 954c267b83f..acaea17649c 100644 --- a/modules/services/x11/xserver/default.nix +++ b/modules/services/x11/xserver/default.nix @@ -538,6 +538,14 @@ mkIf cfg.enable { start on ${if cfg.autorun then "hal" else "never"} start script + + # Ugly hack: wait until udev has started since the X server + # needs various devices. This would more properly be + # expressed as an Upstart dependency, but AFAIK in "start + # on" we can't express a logical AND. + while ! initctl status udev 2>&1 | grep -q running; do + sleep 1 + done rm -f /var/run/opengl-driver ${if videoDriver == "nvidia" |