-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Moved the default partitioning section.
- Loading branch information
Showing
7 changed files
with
27 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,22 +19,11 @@ | |
| <meta name="maintainer" content="[email protected]" its:translate="no"/> | ||
| <title>&ignition; configuration examples</title> | ||
| </info> | ||
| <section xml:id="sec-ignition-examples"> | ||
| <title>Configuration examples</title> | ||
|
|
||
| <para> | ||
| This section provides several examples of the &ignition; configuration in | ||
| the built-in JSON format. | ||
| </para> | ||
| <important> | ||
| <para> | ||
| <xref linkend="deployment-default-partitioning"/> lists subvolumes that | ||
| are mounted by default when running the pre-built image. If you want to | ||
| add a new user or modify any of the files on a subvolume that is not | ||
| mounted by default, you need to declare such subvolume first so that it | ||
| is mounted as well. Find more details about mounting file systems in | ||
| <xref linkend="sec-storage-filesystem"/>. | ||
| </para> | ||
| </important> | ||
| </para> | ||
| <note> | ||
| <title>The <literal>version</literal> attribute is mandatory</title> | ||
| <para> | ||
|
|
@@ -43,6 +32,9 @@ | |
| specification. | ||
| </para> | ||
| </note> | ||
|
|
||
| <xi:include href="../snippets/deployment-raw-partitioning.xml"/> | ||
|
|
||
| <section xml:id="sec-ignition-storage"> | ||
| <title>Storage configuration</title> | ||
| <para> | ||
|
|
@@ -405,5 +397,5 @@ | |
| } | ||
| </screen> | ||
| </section> | ||
| </section> | ||
| </xi:include> | ||
| </topic> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE topic | ||
| <!DOCTYPE section | ||
| [ | ||
| <!ENTITY % entities SYSTEM "../common/generic-entities.ent"> | ||
| %entities; | ||
|
|
@@ -8,8 +8,8 @@ | |
| <!-- point back to this document with a similar comment added to your legacy doc piece --> | ||
| <!-- refer to README.md for file and id naming conventions --> | ||
| <!-- metadata is dealt with on the assembly level --> | ||
| <topic xml:id="deployment-default-partitioning" | ||
| role="concept" xml:lang="en" | ||
| <section xml:id="deployment-default-partitioning" | ||
| xml:lang="en" | ||
| xmlns="http://docbook.org/ns/docbook" version="5.2" | ||
| xmlns:its="http://www.w3.org/2005/11/its" | ||
| xmlns:xi="http://www.w3.org/2001/XInclude" | ||
|
|
@@ -20,27 +20,8 @@ | |
| <!-- can be changed via merge in the assembly --> | ||
| <!--add author's email address--> | ||
| <meta name="maintainer" content="[email protected]" its:translate="no"/> | ||
| <abstract> | ||
| <!-- can be changed via merge in the assembly --> | ||
| <para> | ||
| Introductory text | ||
| </para> | ||
| </abstract> | ||
| </info> | ||
| <para> | ||
| The pre-built images are delivered with a default partitioning scheme. You | ||
| can change it during the first boot by using | ||
| <xref linkend="deployment-configuring-with-ignition" xrefstyle="template:&ignition;"/> | ||
| or | ||
| <xref linkend="deployment-configuring-with-combustion" xrefstyle="template:&combustion;"/>. | ||
| </para> | ||
| <important> | ||
| <title>Btrfs is mandatory for the root file system</title> | ||
| <para> | ||
| If you intend to perform any changes to the default partitioning scheme, | ||
| the root file system must be Btrfs. | ||
| </para> | ||
| </important> | ||
|
|
||
| </info> | ||
| <para> | ||
| Each image has the following subvolumes: | ||
| </para> | ||
|
|
@@ -62,4 +43,10 @@ | |
| subvolumes or partitions must be configured either by &ignition; or | ||
| &combustion;. | ||
| </para> | ||
| </topic> | ||
| <para> | ||
| If you want to | ||
| add a new user or modify any of the files on a subvolume that is not | ||
| mounted by default, you need to declare such subvolume first so that it | ||
| is mounted as well. | ||
| </para> | ||
| </section> | ||