* Move various system initialisation tasks (e.g. mounting filesystems,

initialising network interfaces, etc.) to modules/tasks.  This
  follows the Upstart terminology: a service is a job that doesn't
  usually terminate (e.g. a daemon), while a task is a job that does
  some work and then exits.

svn path=/nixos/branches/modular-nixos/; revision=15771

modules/legacy.nix

@@ -4,14 +4,7 @@
     ../system/nixos-environment.nix
     ../system/nixos-installer.nix
     ../upstart-jobs/cron/locate.nix
-    ../upstart-jobs/filesystems.nix
-    ../upstart-jobs/kbd.nix
     ../upstart-jobs/ldap
-    ../upstart-jobs/lvm.nix
-    ../upstart-jobs/network-interfaces.nix
     ../upstart-jobs/pcmcia.nix
-    ../upstart-jobs/swap.nix
-    ../upstart-jobs/swraid.nix
-    ../upstart-jobs/tty-backgrounds.nix
   ];
 }

modules/module-list.nix

@@ -134,4 +134,11 @@
 # the argument named `runCommand' required by the function is missing
   ./system/upstart/tools.nix
   ./system/upstart/upstart.nix
+  ./tasks/filesystems.nix
+  ./tasks/kbd.nix
+  ./tasks/lvm.nix
+  ./tasks/network-interfaces.nix
+  ./tasks/swap.nix
+  ./tasks/swraid.nix
+  ./tasks/tty-backgrounds.nix
 ]

modules/tasks/tty-backgrounds.nix

@@ -100,7 +100,7 @@ let
     themes = map (x: if x ? theme then (unpackTheme x.theme) else "default") backgrounds;
   };
 
-  unpackTheme = theme: import ../helpers/unpack-theme.nix {
+  unpackTheme = theme: import ../../helpers/unpack-theme.nix {
       inherit stdenv theme;
     };