diff options
| author | Maciej Krüger <mkg20001@gmail.com> | 2021-10-19 17:27:01 +0200 |
|---|---|---|
| committer | Maciej Krüger <mkg20001@gmail.com> | 2021-11-03 07:49:54 +0100 |
| commit | 1c31f8db6ae8437da737ccc9276d9a95450f5d8a (patch) | |
| tree | 0b349ff5b1b6042de087194b7cb80d574e1d28c6 /nixos/maintainers | |
| parent | a797967cecf8414a382aaf95a96f21f6871e4a4d (diff) | |
nixosTest.lxdImage: add lxdImage test
Diffstat (limited to 'nixos/maintainers')
| -rw-r--r-- | nixos/maintainers/scripts/lxd/lxd-image-inner.nix | 1 | ||||
| -rw-r--r-- | nixos/maintainers/scripts/lxd/lxd-image.nix | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/nixos/maintainers/scripts/lxd/lxd-image-inner.nix b/nixos/maintainers/scripts/lxd/lxd-image-inner.nix index f57cacfce5e6..74634fd1671c 100644 --- a/nixos/maintainers/scripts/lxd/lxd-image-inner.nix +++ b/nixos/maintainers/scripts/lxd/lxd-image-inner.nix @@ -9,7 +9,6 @@ with lib; { imports = [ # Include the default lxd configuration. - # <nixpkgs/nixos/modules/virtualisation/lxc-container.nix> ../../../modules/virtualisation/lxc-container.nix # Include the container-specific autogenerated configuration. ./lxd.nix diff --git a/nixos/maintainers/scripts/lxd/lxd-image.nix b/nixos/maintainers/scripts/lxd/lxd-image.nix index c09f9e3a9e25..c76b9fcc7f77 100644 --- a/nixos/maintainers/scripts/lxd/lxd-image.nix +++ b/nixos/maintainers/scripts/lxd/lxd-image.nix @@ -19,15 +19,10 @@ with lib; if [ ! -e /etc/nixos/configuration.nix ]; then mkdir -p /etc/nixos cat ${./lxd-image-inner.nix} > /etc/nixos/configuration.nix + sed 's|../../../modules/virtualisation/lxc-container.nix|<nixpkgs/nixos/modules/virtualisation/lxc-container.nix>|g' -i /etc/nixos/configuration.nix fi ''; - # Make lxc exec work properly - system.activationScripts.bash = '' - mkdir -p /bin - ln -sf /run/current-system/sw/bin/bash /bin/bash - ''; - # Network networking.useDHCP = false; networking.interfaces.eth0.useDHCP = true; |