container.nix -> docker-container.nix

Changed files
+2 -6
nixos
modules
-4
nixos/modules/profiles/container.nix nixos/modules/profiles/docker-container.nix
···
${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
···
${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
'';
# Install new init script
system.activationScripts.installInitScript = ''
ln -fs $systemConfig/init /init
+1 -1
nixos/modules/virtualisation/docker-image.nix
···
{
imports = [
-
../profiles/container.nix
];
boot.postBootCommands =
···
{
imports = [
+
../profiles/docker-container.nix # FIXME, shouldn't include something from profiles/
];
boot.postBootCommands =
+1 -1
nixos/modules/virtualisation/lxc-container.nix
···
{
imports = [
-
../profiles/container.nix
];
# Allow the user to login as root without password.
···
{
imports = [
+
../profiles/docker-container.nix # FIXME, shouldn't include something from profiles/
];
# Allow the user to login as root without password.