summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-09-29 19:18:29 +0100
committerGitHub <noreply@github.com>2018-09-29 19:18:29 +0100
commitd6665b43dd5ebaccec3329a75e44bd50e8f0e04a (patch)
treedb32fbd05ffbdd4f516f8942df9efae0aae23e17
parenteaefbb83e2b1e13ada7532cd4952bfff483a21f0 (diff)
parentf309440ee3b6830fd886f824be81b0fecfba52fc (diff)
downloadnixlib-d6665b43dd5ebaccec3329a75e44bd50e8f0e04a.tar
nixlib-d6665b43dd5ebaccec3329a75e44bd50e8f0e04a.tar.gz
nixlib-d6665b43dd5ebaccec3329a75e44bd50e8f0e04a.tar.bz2
nixlib-d6665b43dd5ebaccec3329a75e44bd50e8f0e04a.tar.lz
nixlib-d6665b43dd5ebaccec3329a75e44bd50e8f0e04a.tar.xz
nixlib-d6665b43dd5ebaccec3329a75e44bd50e8f0e04a.tar.zst
nixlib-d6665b43dd5ebaccec3329a75e44bd50e8f0e04a.zip
Merge pull request #47473 from arianvp/imperative-doc-fix
doc: Update section about imperative containers
-rw-r--r--nixos/doc/manual/administration/imperative-containers.xml22
1 files changed, 11 insertions, 11 deletions
diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml
index 9bb62bc2ece9..cfd0e5c172b1 100644
--- a/nixos/doc/manual/administration/imperative-containers.xml
+++ b/nixos/doc/manual/administration/imperative-containers.xml
@@ -73,8 +73,7 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
  </para>
 
  <para>
-  There are several ways to change the configuration of the container. First,
-  on the host, you can edit
+  To change the configuration of the container, you can edit
   <literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>,
   and run
 <screen>
@@ -87,7 +86,16 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
   <xref linkend="opt-services.httpd.enable"/> = true;
   <xref linkend="opt-services.httpd.adminAddr"/> = "foo@example.org";
   <xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 ];
-'
+  '
+
+  <para>
+    Note that in previous versions of NixOS (17.09 and earlier) one could
+    also use all nix-related commands (like <command>nixos-rebuild switch</command>) 
+    from inside the container. However, since the release of Nix 2.0 this
+    is not supported anymore. Supporting Nix commands inside the
+    container might be possible again in future versions. See
+    <link xlink:ref="https://github.com/NixOS/nixpkgs/issues/40355">the github issue</link> for tracking progress on this issue.
+  </para>
 
 # curl http://$(nixos-container show-ip foo)/
 &lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…
@@ -97,14 +105,6 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
  </para>
 
  <para>
-  Alternatively, you can change the configuration from within the container
-  itself by running <command>nixos-rebuild switch</command> inside the
-  container. Note that the container by default does not have a copy of the
-  NixOS channel, so you should run <command>nix-channel --update</command>
-  first.
- </para>
-
- <para>
   Containers can be stopped and started using <literal>nixos-container
   stop</literal> and <literal>nixos-container start</literal>, respectively, or
   by using <command>systemctl</command> on the container’s service unit. To