From d8ee91cb54c267a5a119d59746e80ca61015775e Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 12 Dec 2014 20:28:01 +0100 Subject: [PATCH] nixos: container profile, fix a few things --- nixos/modules/profiles/container.nix | 4 +--- nixos/release.nix | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/modules/profiles/container.nix b/nixos/modules/profiles/container.nix index e6344a0d5c7..dd2e6579a93 100644 --- a/nixos/modules/profiles/container.nix +++ b/nixos/modules/profiles/container.nix @@ -41,9 +41,7 @@ in { rm /nix-path-registration fi - # nixos-rebuild also requires a "system" profile and an - # /etc/NIXOS tag. - touch /etc/NIXOS + # nixos-rebuild also requires a "system" profile ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system ''; diff --git a/nixos/release.nix b/nixos/release.nix index efc49adce46..12dd81f8970 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -214,7 +214,7 @@ in rec { }); # Provide container tarball for lxc, libvirt-lxc, docker-lxc, ... - container_tarball = forAllSystems (system: makeSystemTarball { + containerTarball = forAllSystems (system: makeSystemTarball { module = ./modules/virtualisation/lxc-container.nix; inherit system; });