diff options
author | tv <tv@krebsco.de> | 2018-09-06 23:10:09 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2018-09-06 23:10:09 +0200 |
commit | 03764d6765f8d2734d0960bc75cc6856bf0893d8 (patch) | |
tree | b8cbbdc3a0381b5d1b1d08149c38a6bd5be5e9c5 /makefu/1systems/wbob | |
parent | 86466154f11748365cdab50b6ac113bdfd5542be (diff) | |
parent | 96c4ab61202f515c7a361ef76c398e542771d6b4 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/1systems/wbob')
-rw-r--r-- | makefu/1systems/wbob/config.nix | 2 | ||||
-rw-r--r-- | makefu/1systems/wbob/source.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix index 9d8a91e6d..e1d66a2f9 100644 --- a/makefu/1systems/wbob/config.nix +++ b/makefu/1systems/wbob/config.nix @@ -150,7 +150,7 @@ in { # rt2870 with nonfree creates wlp2s0 from wlp0s20u2 # not explicitly setting the interface results in wpa_supplicant to crash networking.wireless.interfaces = [ "wlp2s0" ]; - networking.interfaces.virbr1.ip4 = [{ + networking.interfaces.virbr1.ipv4.addresses = [{ address = "10.8.8.11"; prefixLength = 24; }]; diff --git a/makefu/1systems/wbob/source.nix b/makefu/1systems/wbob/source.nix index b768aa87d..c76f73760 100644 --- a/makefu/1systems/wbob/source.nix +++ b/makefu/1systems/wbob/source.nix @@ -1,4 +1,4 @@ -import <stockholm/makefu/source.nix> { +{ name="wbob"; # musnix = true; } |