container.nix -> docker-container.nix

NixOS · Apr 19, 2015 · 1cb5583 · rickynils · Sep 7, 2016 · 1cb5583
1 parent 57b0576
commit 1cb5583
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/nixos/modules/profiles/container.nix → nixos/modules/profiles/docker-container.nix b/nixos/modules/profiles/container.nix → 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
@@ -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
@@ -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.