cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

nixos/lxc-container: undo some of the minimal profile stuff

Browse source
This commit is contained in:
Izorkin 2022-12-09 21:16:32 +03:00
parent d4288c8e3f
commit 2b6bfed79c
No known key found for this signature in database
GPG key ID: 1436C1B3F3679F09
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nixos/maintainers/scripts/lxd/lxd-image-inner.nix
View file

@ -94,9 +94,4 @@ with lib;
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "21.05"; # Did you read the comment? system.stateVersion = "21.05"; # Did you read the comment?
# As this is intended as a stadalone image, undo some of the minimal profile stuff
documentation.enable = true;
documentation.nixos.enable = true;
environment.noXlibs = false;
} }

5
nixos/maintainers/scripts/lxd/lxd-image.nix
View file

@ -26,9 +26,4 @@ with lib;
# Network # Network
networking.useDHCP = false; networking.useDHCP = false;
networking.interfaces.eth0.useDHCP = true; networking.interfaces.eth0.useDHCP = true;
# As this is intended as a standalone image, undo some of the minimal profile stuff
documentation.enable = true;
documentation.nixos.enable = true;
environment.noXlibs = false;
} }

8
nixos/modules/virtualisation/lxc-container.nix
View file

@ -51,8 +51,8 @@ in
{ {
imports = [ imports = [
../installer/cd-dvd/channel.nix ../installer/cd-dvd/channel.nix
../profiles/minimal.nix
../profiles/clone-config.nix ../profiles/clone-config.nix
../profiles/minimal.nix
]; ];
options = { options = {
@ -199,5 +199,11 @@ in
# Containers should be light-weight, so start sshd on demand. # Containers should be light-weight, so start sshd on demand.
services.openssh.enable = mkDefault true; services.openssh.enable = mkDefault true;
services.openssh.startWhenNeeded = mkDefault true; services.openssh.startWhenNeeded = mkDefault true;
# As this is intended as a standalone image, undo some of the minimal profile stuff
environment.noXlibs = false;
documentation.enable = true;
documentation.nixos.enable = true;
services.logrotate.enable = true;
}; };
} }