Add config.etc option to add extra /etc/* files.

svn path=/nixos/trunk/; revision=13234

system/options.nix

@@ -592,7 +592,6 @@ in
     # then the checking in upstart-jobs/default.nix can be removed again (together with passing arg optionDeclarations)
   };
 
-
   services = {
 
 
@@ -3008,6 +3007,20 @@ root        ALL=(ALL) SETENV: ALL
       ";
     };
 
+    # should be moved to etc/default.nix
+    etc = mkOption {
+      default = [];
+      example = [
+        { source = "/nix/store/.../etc/dir/file.conf.example";
+          target = "dir/file.conf";
+          mode = "0440";
+        }
+      ];
+      description = "
+        List of files that have to be linked in /etc.
+      ";
+    };
+
     nix = mkOption {
       default = pkgs.nixUnstable;
       example = pkgs.nixCustomFun /root/nix.tar.gz;

system/system.nix

@@ -116,7 +116,9 @@ rec {
   etc = import ../etc/default.nix {
     inherit config pkgs upstartJobs systemPath wrapperDir
       defaultShell nixEnvVars modulesTree nssModulesPath;
-    extraEtc = pkgs.lib.concatLists (map (job: job.extraEtc) upstartJobs.jobs);
+    extraEtc =
+       (pkgs.lib.concatLists (map (job: job.extraEtc) upstartJobs.jobs))
+    ++ config.environment.etc;
   };