summary refs log tree commit diff
path: root/nixos/doc/manual/installation
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2019-10-07 20:44:42 +0200
committerVladimír Čunát <v@cunat.cz>2019-10-07 20:56:59 +0200
commitf760f0ef486815bf7d7223773addc35952d270b6 (patch)
tree009a1645ea21dafb1a064efe631d35a1ebf77bb9 /nixos/doc/manual/installation
parent56e1ea32f4d07d2b02a45be7d1eabef861e3d0d8 (diff)
downloadnixpkgs-f760f0ef486815bf7d7223773addc35952d270b6.tar
nixpkgs-f760f0ef486815bf7d7223773addc35952d270b6.tar.gz
nixpkgs-f760f0ef486815bf7d7223773addc35952d270b6.tar.bz2
nixpkgs-f760f0ef486815bf7d7223773addc35952d270b6.tar.lz
nixpkgs-f760f0ef486815bf7d7223773addc35952d270b6.tar.xz
nixpkgs-f760f0ef486815bf7d7223773addc35952d270b6.tar.zst
nixpkgs-f760f0ef486815bf7d7223773addc35952d270b6.zip
Revert "Merge #67232: machinectl compliant NixOS installation"
This reverts commit 66967ec7521d065f605795d64ddbbbd4fcd448c3, reversing
changes made to fb6595eafdb90ef0bc7a31c2bfc9204e4cad11d9.
Fixes #70442; discussion: https://github.com/NixOS/nixpkgs/pull/70027
Diffstat (limited to 'nixos/doc/manual/installation')
-rw-r--r--nixos/doc/manual/installation/installing-nspawn-container.xml37
-rw-r--r--nixos/doc/manual/installation/installing.xml3
2 files changed, 0 insertions, 40 deletions
diff --git a/nixos/doc/manual/installation/installing-nspawn-container.xml b/nixos/doc/manual/installation/installing-nspawn-container.xml
deleted file mode 100644
index ae893c53c90..00000000000
--- a/nixos/doc/manual/installation/installing-nspawn-container.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-         version="5.0"
-         xml:id="sec-installing-nspawn-container">
- <title>Installing into a nspawn container</title>
-
- <para>
-  For installing a NixOS into a systemd nspawn container the NixOS installation tools are needed.
-  If you run another distribution than NixOS on your host,
-  please follow <xref linkend="sec-installing-from-other-distro"/> steps 1, 2, and 3.
- </para>
-
- <para>
-  Create a NixOS configuration file <filename>/var/lib/machines/my-container/etc/nixos/configuration.nix</filename>.
-  It is important that the container root file system is under <filename>/var/lib/machines</filename>.
-  This is the standard location where <command>machinectl</command> will look for containers.
-  If you choose place the root into another location you need to start the container directly with <command>systemd-nspawn</command>.
-  The file needs to have at least following options enabled:
-<programlisting>
-<xref linkend="opt-boot.isContainer"/> = true;
-<xref linkend="opt-boot.loader.initScript.enable"/> = true;
-</programlisting>
-  If your host uses <command>systemd-networkd</command> to configure the network,
-  you can also enable <xref linkend="opt-networking.useNetworkd"/> to use networkd default network configuration for your host and container.
- </para>
-
- <para>
-  Install the container by running following command:
-   <screen>nixos-install --root /var/lib/machines/my-container \
-     --no-channel-copy --no-root-passwd --no-bootloader</screen>
- </para>
-
- <para>
-  Start the container by running following command:
-  <screen>machinectl start my-container</screen>
- </para>
-
-</section>
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 270372022fa..f1e1568c034 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -563,8 +563,5 @@ Retype new UNIX password: ***</screen>
   <xi:include href="installing-from-other-distro.xml" />
 
   <xi:include href="installing-behind-a-proxy.xml" />
-
-  <xi:include href="installing-nspawn-container.xml" />
-
  </section>
 </chapter>