From fc9111fadf9b2b471f23d6336e3674ee23fab404 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 28 May 2009 15:03:05 +0000 Subject: [PATCH] * 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 | 7 ------- modules/module-list.nix | 7 +++++++ {upstart-jobs => modules/tasks}/filesystems.nix | 0 {upstart-jobs => modules/tasks}/kbd.nix | 0 {upstart-jobs => modules/tasks}/lvm.nix | 0 {upstart-jobs => modules/tasks}/network-interfaces.nix | 0 {upstart-jobs => modules/tasks}/swap.nix | 0 {upstart-jobs => modules/tasks}/swraid.nix | 0 {upstart-jobs => modules/tasks}/tty-backgrounds-combine.sh | 0 {upstart-jobs => modules/tasks}/tty-backgrounds.nix | 2 +- 10 files changed, 8 insertions(+), 8 deletions(-) rename {upstart-jobs => modules/tasks}/filesystems.nix (100%) rename {upstart-jobs => modules/tasks}/kbd.nix (100%) rename {upstart-jobs => modules/tasks}/lvm.nix (100%) rename {upstart-jobs => modules/tasks}/network-interfaces.nix (100%) rename {upstart-jobs => modules/tasks}/swap.nix (100%) rename {upstart-jobs => modules/tasks}/swraid.nix (100%) rename {upstart-jobs => modules/tasks}/tty-backgrounds-combine.sh (100%) rename {upstart-jobs => modules/tasks}/tty-backgrounds.nix (98%) diff --git a/modules/legacy.nix b/modules/legacy.nix index 7a2f223fc98..c1f8a45d441 100644 --- a/modules/legacy.nix +++ b/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 ]; } diff --git a/modules/module-list.nix b/modules/module-list.nix index 6a08aa276d4..05a81c76fa2 100644 --- a/modules/module-list.nix +++ b/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 ] diff --git a/upstart-jobs/filesystems.nix b/modules/tasks/filesystems.nix similarity index 100% rename from upstart-jobs/filesystems.nix rename to modules/tasks/filesystems.nix diff --git a/upstart-jobs/kbd.nix b/modules/tasks/kbd.nix similarity index 100% rename from upstart-jobs/kbd.nix rename to modules/tasks/kbd.nix diff --git a/upstart-jobs/lvm.nix b/modules/tasks/lvm.nix similarity index 100% rename from upstart-jobs/lvm.nix rename to modules/tasks/lvm.nix diff --git a/upstart-jobs/network-interfaces.nix b/modules/tasks/network-interfaces.nix similarity index 100% rename from upstart-jobs/network-interfaces.nix rename to modules/tasks/network-interfaces.nix diff --git a/upstart-jobs/swap.nix b/modules/tasks/swap.nix similarity index 100% rename from upstart-jobs/swap.nix rename to modules/tasks/swap.nix diff --git a/upstart-jobs/swraid.nix b/modules/tasks/swraid.nix similarity index 100% rename from upstart-jobs/swraid.nix rename to modules/tasks/swraid.nix diff --git a/upstart-jobs/tty-backgrounds-combine.sh b/modules/tasks/tty-backgrounds-combine.sh similarity index 100% rename from upstart-jobs/tty-backgrounds-combine.sh rename to modules/tasks/tty-backgrounds-combine.sh diff --git a/upstart-jobs/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix similarity index 98% rename from upstart-jobs/tty-backgrounds.nix rename to modules/tasks/tty-backgrounds.nix index d80de2eef70..1e5f8f08d95 100644 --- a/upstart-jobs/tty-backgrounds.nix +++ b/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; };