summary refs log tree commit diff
path: root/nixos/doc/manual/administration
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2018-09-30 03:18:58 +0300
committerTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2018-09-30 03:18:58 +0300
commit74df71bc8b446dd803aed3990a1148f258772f65 (patch)
tree24ff3043c6cfc2d19ba0a9f93871ccb388238c6c /nixos/doc/manual/administration
parent02658a72760a7d137a3b0e47812da137ad0a8e03 (diff)
downloadnixpkgs-74df71bc8b446dd803aed3990a1148f258772f65.tar
nixpkgs-74df71bc8b446dd803aed3990a1148f258772f65.tar.gz
nixpkgs-74df71bc8b446dd803aed3990a1148f258772f65.tar.bz2
nixpkgs-74df71bc8b446dd803aed3990a1148f258772f65.tar.lz
nixpkgs-74df71bc8b446dd803aed3990a1148f258772f65.tar.xz
nixpkgs-74df71bc8b446dd803aed3990a1148f258772f65.tar.zst
nixpkgs-74df71bc8b446dd803aed3990a1148f258772f65.zip
Revert "doc: Update section about imperative containers"
This reverts commit f309440ee3b6830fd886f824be81b0fecfba52fc.

Breaks manual build:

https://nix-cache.s3.amazonaws.com/log/wnjcy6n5f871bpyy9nd06smiz1ggv99c-nixos-manual-combined.drv
Diffstat (limited to 'nixos/doc/manual/administration')
-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 cfd0e5c172b..9bb62bc2ece 100644
--- a/nixos/doc/manual/administration/imperative-containers.xml
+++ b/nixos/doc/manual/administration/imperative-containers.xml
@@ -73,7 +73,8 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
  </para>
 
  <para>
-  To change the configuration of the container, you can edit
+  There are several ways to change the configuration of the container. First,
+  on the host, you can edit
   <literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>,
   and run
 <screen>
@@ -86,16 +87,7 @@ 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">…
@@ -105,6 +97,14 @@ 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