summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2021-07-03 12:02:48 +0800
committerBobby Rong <rjl931189261@126.com>2021-07-03 12:06:27 +0800
commitd80bde37a820767757a5ab33a83a7485822f5625 (patch)
treea196244453d9cfaf88930f0c9890a3fc41b45132
parent51bf2e175ea8f511f6ed94ecb6c7cca3a873ccd7 (diff)
downloadnixpkgs-d80bde37a820767757a5ab33a83a7485822f5625.tar
nixpkgs-d80bde37a820767757a5ab33a83a7485822f5625.tar.gz
nixpkgs-d80bde37a820767757a5ab33a83a7485822f5625.tar.bz2
nixpkgs-d80bde37a820767757a5ab33a83a7485822f5625.tar.lz
nixpkgs-d80bde37a820767757a5ab33a83a7485822f5625.tar.xz
nixpkgs-d80bde37a820767757a5ab33a83a7485822f5625.tar.zst
nixpkgs-d80bde37a820767757a5ab33a83a7485822f5625.zip
nixos: nixos/doc/manual/development/testing-installer.xml to CommonMark
-rw-r--r--nixos/doc/manual/development/development.xml2
-rw-r--r--nixos/doc/manual/development/testing-installer.chapter.md18
-rw-r--r--nixos/doc/manual/development/testing-installer.xml22
-rw-r--r--nixos/doc/manual/from_md/development/testing-installer.chapter.xml22
4 files changed, 41 insertions, 23 deletions
diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml
index 5b2fedf1606..05c6a5b1134 100644
--- a/nixos/doc/manual/development/development.xml
+++ b/nixos/doc/manual/development/development.xml
@@ -15,5 +15,5 @@
  <xi:include href="writing-documentation.xml" />
  <xi:include href="../from_md/development/building-nixos.chapter.xml" />
  <xi:include href="nixos-tests.xml" />
- <xi:include href="testing-installer.xml" />
+ <xi:include href="../from_md/development/testing-installer.chapter.xml" />
 </part>
diff --git a/nixos/doc/manual/development/testing-installer.chapter.md b/nixos/doc/manual/development/testing-installer.chapter.md
new file mode 100644
index 00000000000..2eaa0161492
--- /dev/null
+++ b/nixos/doc/manual/development/testing-installer.chapter.md
@@ -0,0 +1,18 @@
+# Testing the Installer {#ch-testing-installer}
+
+Building, burning, and booting from an installation CD is rather
+tedious, so here is a quick way to see if the installer works properly:
+
+```ShellSession
+# mount -t tmpfs none /mnt
+# nixos-generate-config --root /mnt
+$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-install
+# ./result/bin/nixos-install
+```
+
+To start a login shell in the new NixOS installation in `/mnt`:
+
+```ShellSession
+$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-enter
+# ./result/bin/nixos-enter
+```
diff --git a/nixos/doc/manual/development/testing-installer.xml b/nixos/doc/manual/development/testing-installer.xml
deleted file mode 100644
index 902f995fbc1..00000000000
--- a/nixos/doc/manual/development/testing-installer.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-        xmlns:xlink="http://www.w3.org/1999/xlink"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
-        version="5.0"
-        xml:id="ch-testing-installer">
- <title>Testing the Installer</title>
- <para>
-  Building, burning, and booting from an installation CD is rather tedious, so
-  here is a quick way to see if the installer works properly:
-<screen>
-<prompt># </prompt>mount -t tmpfs none /mnt
-<prompt># </prompt>nixos-generate-config --root /mnt
-<prompt>$ </prompt>nix-build '&lt;nixpkgs/nixos>' -A config.system.build.nixos-install
-<prompt># </prompt>./result/bin/nixos-install</screen>
-  To start a login shell in the new NixOS installation in
-  <filename>/mnt</filename>:
-<screen>
-<prompt>$ </prompt>nix-build '&lt;nixpkgs/nixos>' -A config.system.build.nixos-enter
-<prompt># </prompt>./result/bin/nixos-enter
-</screen>
- </para>
-</chapter>
diff --git a/nixos/doc/manual/from_md/development/testing-installer.chapter.xml b/nixos/doc/manual/from_md/development/testing-installer.chapter.xml
new file mode 100644
index 00000000000..286d49f3c29
--- /dev/null
+++ b/nixos/doc/manual/from_md/development/testing-installer.chapter.xml
@@ -0,0 +1,22 @@
+<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ch-testing-installer">
+  <title>Testing the Installer</title>
+  <para>
+    Building, burning, and booting from an installation CD is rather
+    tedious, so here is a quick way to see if the installer works
+    properly:
+  </para>
+  <programlisting>
+# mount -t tmpfs none /mnt
+# nixos-generate-config --root /mnt
+$ nix-build '&lt;nixpkgs/nixos&gt;' -A config.system.build.nixos-install
+# ./result/bin/nixos-install
+</programlisting>
+  <para>
+    To start a login shell in the new NixOS installation in
+    <literal>/mnt</literal>:
+  </para>
+  <programlisting>
+$ nix-build '&lt;nixpkgs/nixos&gt;' -A config.system.build.nixos-enter
+# ./result/bin/nixos-enter
+</programlisting>
+</chapter>