public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3843 from wkennington/master.iffix

Browse Source 
nixos/network-interfaces: Sanitize sys-subsystem device names
This commit is contained in:
Michael Raskin 2014-09-03 21:15:46 +04:00
commit ab023cc559
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nixos/modules/tasks/network-interfaces.nix
View File

@ -1,6 +1,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, utils, ... }:
with lib; with lib;
with utils;
let let
@ -10,6 +11,10 @@ let
hasSits = cfg.sits != { }; hasSits = cfg.sits != { };
hasBonds = cfg.bonds != { }; hasBonds = cfg.bonds != { };
# We must escape interfaces due to the systemd interpretation
subsystemDevice = interface:
"sys-subsystem-net-devices-${escapeSystemdPath interface}.device";
addrOpts = v: addrOpts = v:
assert v == 4 || v == 6; assert v == 4 || v == 6;
{ {
@ -603,8 +608,8 @@ in
nameValuePair "${i.name}-cfg" nameValuePair "${i.name}-cfg"
{ description = "Configuration of ${i.name}"; { description = "Configuration of ${i.name}";
wantedBy = [ "network-interfaces.target" ]; wantedBy = [ "network-interfaces.target" ];
bindsTo = [ "sys-subsystem-net-devices-${i.name}.device" ]; bindsTo = [ (subsystemDevice i.name) ];
after = [ "sys-subsystem-net-devices-${i.name}.device" ]; after = [ (subsystemDevice i.name) ];
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute pkgs.gawk ]; path = [ pkgs.iproute pkgs.gawk ];
@ -684,7 +689,7 @@ in
{ description = "Virtual Network Interface ${i.name}"; { description = "Virtual Network Interface ${i.name}";
requires = [ "dev-net-tun.device" ]; requires = [ "dev-net-tun.device" ];
after = [ "dev-net-tun.device" ]; after = [ "dev-net-tun.device" ];
wantedBy = [ "network.target" "sys-subsystem-net-devices-${i.name}.device" ]; wantedBy = [ "network.target" (subsystemDevice i.name) ];
path = [ pkgs.iproute ]; path = [ pkgs.iproute ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
@ -702,10 +707,10 @@ in
createBridgeDevice = n: v: nameValuePair "${n}-netdev" createBridgeDevice = n: v: nameValuePair "${n}-netdev"
(let (let
deps = map (i: "sys-subsystem-net-devices-${i}.device") v.interfaces; deps = map subsystemDevice v.interfaces;
in in
{ description = "Bridge Interface ${n}"; { description = "Bridge Interface ${n}";
wantedBy = [ "network.target" "sys-subsystem-net-devices-${n}.device" ]; wantedBy = [ "network.target" (subsystemDevice n) ];
bindsTo = deps; bindsTo = deps;
after = deps; after = deps;
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
@ -742,10 +747,10 @@ in
createBondDevice = n: v: nameValuePair "${n}-netdev" createBondDevice = n: v: nameValuePair "${n}-netdev"
(let (let
deps = map (i: "sys-subsystem-net-devices-${i}.device") v.interfaces; deps = map subsystemDevice v.interfaces;
in in
{ description = "Bond Interface ${n}"; { description = "Bond Interface ${n}";
wantedBy = [ "network.target" "sys-subsystem-net-devices-${n}.device" ]; wantedBy = [ "network.target" (subsystemDevice n) ];
bindsTo = deps; bindsTo = deps;
after = deps; after = deps;
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
@ -781,10 +786,10 @@ in
createSitDevice = n: v: nameValuePair "${n}-netdev" createSitDevice = n: v: nameValuePair "${n}-netdev"
(let (let
deps = optional (v.dev != null) "sys-subsystem-net-devices-${v.dev}.device"; deps = optional (v.dev != null) (subsystemDevice v.dev);
in in
{ description = "6-to-4 Tunnel Interface ${n}"; { description = "6-to-4 Tunnel Interface ${n}";
wantedBy = [ "network.target" "sys-subsystem-net-devices-${n}.device" ]; wantedBy = [ "network.target" (subsystemDevice n) ];
bindsTo = deps; bindsTo = deps;
after = deps; after = deps;
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
@ -807,10 +812,10 @@ in
createVlanDevice = n: v: nameValuePair "${n}-netdev" createVlanDevice = n: v: nameValuePair "${n}-netdev"
(let (let
deps = [ "sys-subsystem-net-devices-${v.interface}.device" ]; deps = [ (subsystemDevice v.interface) ];
in in
{ description = "Vlan Interface ${n}"; { description = "Vlan Interface ${n}";
wantedBy = [ "network.target" "sys-subsystem-net-devices-${n}.device" ]; wantedBy = [ "network.target" (subsystemDevice n) ];
bindsTo = deps; bindsTo = deps;
after = deps; after = deps;
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";