From 03f77ca82bb792abc77f7b8f968122e5cadf2f81 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 13 Jun 2010 20:59:49 +0000
Subject: [PATCH] * PostgreSQL / MySQL: depend on the "filesystem" event.

svn path=/nixos/branches/boot-order/; revision=22247
---
 modules/services/databases/mysql.nix      |  2 +-
 modules/services/databases/postgresql.nix | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index 19c0bcc418a..9c97a15d751 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -100,7 +100,7 @@ in
     jobs.mysql =
       { description = "MySQL server";
 
-        startOn = "started network-interfaces";
+        startOn = "filesystem";
 
         preStart =
           ''
diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index ae6ac463dad..38d2568613e 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -28,9 +28,6 @@ let
 
   postgresql = postgresqlAndPlugins pkgs.postgresql;
 
-  startDependency = if config.services.gw6c.enable then 
-    "gw6c" else "network-interfaces";
-
   run = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} postgres";
 
   flags = optional cfg.enableTCPIP "-i";
@@ -120,10 +117,10 @@ in
         default = [];
         example = "pkgs.postgis"; # of course don't use a string here!
         description = ''
-          When this list contains elemnts a new store path is created.
-          Postgresql and the elments are symlinked into it. Then pg_config,
+          When this list contains elements a new store path is created.
+          PostgreSQL and the elments are symlinked into it. Then pg_config,
           postgres and pc_ctl are copied to make them use the new
-          $out/lib directory as pkglibdir. This make it possible to use postgis
+          $out/lib directory as pkglibdir. This makes it possible to use postgis
           without patching the .sql files which reference $libdir/postgis-1.5.
         '';
         # Note: the duplication of executables is about 4MB size.
@@ -160,7 +157,7 @@ in
     jobs.postgresql =
       { description = "PostgreSQL server";
 
-        startOn = "started ${startDependency}";
+        startOn = "filesystem";
 
         environment =
           { TZ = config.time.timeZone;