Author: mkwik
Date: Sun Mar 4 18:44:47 2012
New Revision: 32781
URL: https://nixos.org/websvn/nix/?rev=32781&sc=1
Log:
changed the way networking-providers plug themselves before "networking"
Modified:
nixos/trunk/modules/services/networking/gogoclient.nix
nixos/trunk/modules/services/networking/gw6c/default.nix
nixos/trunk/modules/tasks/network-interfaces.nix
Modified: nixos/trunk/modules/services/networking/gogoclient.nix
==============================================================================
--- nixos/trunk/modules/services/networking/gogoclient.nix Sun Mar 4
18:44:42 2012 (r32780)
+++ nixos/trunk/modules/services/networking/gogoclient.nix Sun Mar 4
18:44:47 2012 (r32781)
@@ -58,15 +58,12 @@
# environment.systemPackages = [pkgs.gogoclient];
- networking = {
- enableIPv6 = true;
- interfaceJobs = optional cfg.autorun config.jobs.gogoclient;
- };
+ networking.enableIPv6 = true;
jobs.gogoclient = {
name = "gogoclient";
description = "ipv6 tunnel";
- startOn = if cfg.autorun then "started network-interfaces" else "";
+ startOn = optionalString cfg.autorun "starting networking";
stopOn = "stopping network-interfaces";
script = "cd /var/lib/gogoc; exec gogoc -y -f /etc/gogoc.conf";
path = [pkgs.gogoclient];
Modified: nixos/trunk/modules/services/networking/gw6c/default.nix
==============================================================================
--- nixos/trunk/modules/services/networking/gw6c/default.nix Sun Mar 4
18:44:42 2012 (r32780)
+++ nixos/trunk/modules/services/networking/gw6c/default.nix Sun Mar 4
18:44:47 2012 (r32781)
@@ -150,16 +150,13 @@
jobs.gw6c =
{ description = "Gateway6 client";
- startOn = if cfg.autorun then "started network-interfaces" else "";
+ startOn = optionalString cfg.autorun "starting networking";
stopOn = "stopping network-interfaces";
exec = "${gw6cService}/bin/control start";
};
- networking = {
- enableIPv6 = true;
- interfaceJobs = optional cfg.autorun config.jobs.gw6c;
- };
+ networking.enableIPv6 = true;
};
Modified: nixos/trunk/modules/tasks/network-interfaces.nix
==============================================================================
--- nixos/trunk/modules/tasks/network-interfaces.nix Sun Mar 4 18:44:42
2012 (r32780)
+++ nixos/trunk/modules/tasks/network-interfaces.nix Sun Mar 4 18:44:47
2012 (r32781)
@@ -172,17 +172,6 @@
configured.
'';
};
-
- networking.interfaceJobs = mkOption {
- default = [config.jobs.networkInterfaces];
- type = types.list types.attrs;
- merge = mergeListOption;
- description = ''
- List of jobs that bring up additional interfaces.
- For example vpn / ipv6 / ppp tasks.
- This gets used by certain services as dependency for their upstart job.
- '';
- };
};
@@ -286,16 +275,12 @@
jobs.networking = {
name = "networking";
description = "all required interfaces are up";
- startOn = concatStringsSep " and " (map (job: "started ${job.name}")
cfg.interfaceJobs);
- stopOn = concatStringsSep " and " (map (job: "stopping ${job.name}")
cfg.interfaceJobs);
+ startOn = "started network-interfaces";
+ stopOn = "stopping network-interfaces";
task = true;
exec = "true";
};
-
- networking.interfaceJobs = [config.jobs.networkInterfaces];
-
-
# Set the host name in the activation script. Don't clear it if
# it's not configured in the NixOS configuration, since it may
# have been set by dhclient in the meantime.
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
