diff options
author | tv <tv@krebsco.de> | 2016-08-07 09:54:10 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2016-08-07 09:54:10 +0200 |
commit | 3288d6848f774e00a5fbc2ba060f2df695af8e55 (patch) | |
tree | 971a8ae4fd7b64d2c5b9374d6707d7dc2bb79beb /shared/1systems | |
parent | 3a760096f6b3b49d4bf32465c860ccfd23d174fa (diff) | |
parent | cbf66556afed7220bc95d1716f06cede5a7a8b09 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'shared/1systems')
-rw-r--r-- | shared/1systems/test-arch.nix | 1 | ||||
-rw-r--r-- | shared/1systems/test-centos6.nix | 1 | ||||
-rw-r--r-- | shared/1systems/test-centos7.nix | 1 | ||||
-rw-r--r-- | shared/1systems/wolf.nix | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/shared/1systems/test-arch.nix b/shared/1systems/test-arch.nix index 14fc0384b..a13fea425 100644 --- a/shared/1systems/test-arch.nix +++ b/shared/1systems/test-arch.nix @@ -3,7 +3,6 @@ { imports = [ ../. - ../2configs/base.nix { boot.loader.grub = { device = "/dev/sda"; diff --git a/shared/1systems/test-centos6.nix b/shared/1systems/test-centos6.nix index 8add0b7c1..ebcece383 100644 --- a/shared/1systems/test-centos6.nix +++ b/shared/1systems/test-centos6.nix @@ -8,7 +8,6 @@ let in { imports = [ ../. - ../2configs/base.nix ../2configs/os-templates/CAC-CentOS-6.5-64bit.nix { networking.interfaces.enp11s0.ip4 = [ diff --git a/shared/1systems/test-centos7.nix b/shared/1systems/test-centos7.nix index 65daff509..9ea063c9b 100644 --- a/shared/1systems/test-centos7.nix +++ b/shared/1systems/test-centos7.nix @@ -6,7 +6,6 @@ let in { imports = [ ../. - ../2configs/base.nix ../2configs/os-templates/CAC-CentOS-7-64bit.nix ../2configs/temp/networking.nix ../2configs/temp/dirs.nix diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix index 3818cf2c5..8b0976537 100644 --- a/shared/1systems/wolf.nix +++ b/shared/1systems/wolf.nix @@ -7,7 +7,6 @@ in { imports = [ ../. - ../2configs/base.nix <nixpkgs/nixos/modules/profiles/qemu-guest.nix> ../2configs/collectd-base.nix ../2configs/shack-nix-cacher.nix |