diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-12-12 20:28:01 +0100 |
|---|---|---|
| committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-12-12 20:28:01 +0100 |
| commit | d8ee91cb54c267a5a119d59746e80ca61015775e (patch) | |
| tree | df47f1125197e35e0f4fc30d9cd3b6d5da841daf | |
| parent | 2c85888a04986a25d18f7e1b1fb2a0f498e61ce8 (diff) | |
| download | nixlib-d8ee91cb54c267a5a119d59746e80ca61015775e.tar nixlib-d8ee91cb54c267a5a119d59746e80ca61015775e.tar.gz nixlib-d8ee91cb54c267a5a119d59746e80ca61015775e.tar.bz2 nixlib-d8ee91cb54c267a5a119d59746e80ca61015775e.tar.lz nixlib-d8ee91cb54c267a5a119d59746e80ca61015775e.tar.xz nixlib-d8ee91cb54c267a5a119d59746e80ca61015775e.tar.zst nixlib-d8ee91cb54c267a5a119d59746e80ca61015775e.zip | |
nixos: container profile, fix a few things
| -rw-r--r-- | nixos/modules/profiles/container.nix | 4 | ||||
| -rw-r--r-- | 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 e6344a0d5c7a..dd2e6579a932 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 efc49adce463..12dd81f89707 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; }); |