diff options
| -rw-r--r-- | nixos/modules/profiles/docker-container.nix (renamed from nixos/modules/profiles/container.nix) | 4 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/docker-image.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/lxc-container.nix | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/nixos/modules/profiles/container.nix b/nixos/modules/profiles/docker-container.nix index dd2e6579a932..df762b7ac584 100644 --- a/nixos/modules/profiles/container.nix +++ b/nixos/modules/profiles/docker-container.nix @@ -45,10 +45,6 @@ in { ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system ''; - # Disable some features that are not useful in a container. - sound.enable = mkDefault false; - services.udisks2.enable = mkDefault false; - # Install new init script system.activationScripts.installInitScript = '' ln -fs $systemConfig/init /init diff --git a/nixos/modules/virtualisation/docker-image.nix b/nixos/modules/virtualisation/docker-image.nix index 0195ca5c6dce..9535e3e0d677 100644 --- a/nixos/modules/virtualisation/docker-image.nix +++ b/nixos/modules/virtualisation/docker-image.nix @@ -2,7 +2,7 @@ { imports = [ - ../profiles/container.nix + ../profiles/docker-container.nix # FIXME, shouldn't include something from profiles/ ]; boot.postBootCommands = diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index 2fa749d542ea..0208787e7795 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -4,7 +4,7 @@ with lib; { imports = [ - ../profiles/container.nix + ../profiles/docker-container.nix # FIXME, shouldn't include something from profiles/ ]; # Allow the user to login as root without password. |