From 037d9c6cab17a5dc28ed01c6b96c74e55cee57bc Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sun, 24 Jul 2016 14:45:24 +0100
Subject: nixos-install: add options --closure, --no-channel-copy,
 --no-root-passwd, and --no-bootloader
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #17236

nix-build -A tests.installer.simple '<nixos/release.nix>' succeeds ✓
---
 nixos/doc/manual/man-nixos-install.xml | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

(limited to 'nixos/doc/manual/man-nixos-install.xml')

diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml
index 7ad1be1ec10..15c603256ca 100644
--- a/nixos/doc/manual/man-nixos-install.xml
+++ b/nixos/doc/manual/man-nixos-install.xml
@@ -25,6 +25,19 @@
       <arg choice='plain'><option>--root</option></arg>
       <replaceable>root</replaceable>
     </arg>
+    <arg>
+      <arg choice='plain'><option>--closure</option></arg>
+      <replaceable>closure</replaceable>
+    </arg>
+    <arg>
+      <arg choice='plain'><option>--no-channel-copy</option></arg>
+    </arg>
+    <arg>
+      <arg choice='plain'><option>--no-root-passwd</option></arg>
+    </arg>
+    <arg>
+      <arg choice='plain'><option>--no-bootloader</option></arg>
+    </arg>
     <arg>
       <group choice='req'>
         <arg choice='plain'><option>--max-jobs</option></arg>
@@ -71,12 +84,13 @@ the following steps:
   <filename>/mnt/etc/nixos/configuration.nix</filename>.</para></listitem>
 
   <listitem><para>It installs the GRUB boot loader on the device
-  specified in the option <option>boot.loader.grub.device</option>,
+  specified in the option <option>boot.loader.grub.device</option>
+  (unless <option>--no-bootloader</option> is specified),
   and generates a GRUB configuration file that boots into the NixOS
   configuration just installed.</para></listitem>
 
-  <listitem><para>It prompts you for a password for the root
-  account.</para></listitem>
+  <listitem><para>It prompts you for a password for the root account
+  (unless <option>--no-root-passwd</option> is specified).</para></listitem>
 
 </itemizedlist>
 
@@ -103,6 +117,19 @@ it.</para>
     </listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term><option>--closure</option></term>
+    <listitem>
+      <para>If this option is provided, <command>nixos-install</command> will install the specified closure
+      rather than attempt to build one from <filename>/mnt/etc/nixos/configuration.nix</filename>.</para>
+
+      <para>The closure must be an appropriately configured NixOS system, with boot loader and partition
+      configuration that fits the target host. Such a closure is typically obtained with a command such as
+      <command>nix-build -I nixos-config=./configuration.nix '&lt;nixos&gt;' -A system --no-out-link</command>
+      </para>
+    </listitem>
+  </varlistentry>
+
   <varlistentry>
     <term><option>-I</option></term>
     <listitem>
-- 
cgit 1.4.1