Skip to content

Commit

Permalink
Merge pull request #2043 from rkratky/FR-8490_fixes-updates
Browse files Browse the repository at this point in the history
Formatting and lang. fixes
  • Loading branch information
rkratky authored Aug 7, 2024
2 parents 11e6ffc + 8571157 commit 6263225
Showing 1 changed file with 11 additions and 17 deletions.
28 changes: 11 additions & 17 deletions doc/reference/autoinstall-reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -237,20 +237,16 @@ id
* **type:** string
* **default:** the default value as listed in install-sources

Identifier of the source to install (e.g., ``ubuntu-server-minimal``). The
correct ID to use is specific to a given install ISO. As this ID may change
over time, the canonical place to look for this information is the install ISO
itself, in the file ``casper/install-sources.yaml``, where the value to use is
the ``id``.
Identifier of the source to install (e.g., ``ubuntu-server-minimal``). The correct ID to use is specific to a given installation ISO. As this ID may change over time, the canonical place to look for this information is the installation ISO itself, in the ``casper/install-sources.yaml`` file where the value to use is the ``id``.

Current values:

* ubuntu-server:
* Ubuntu Server:

* minimal: ``ubuntu-server-minimal``
* standard (default): ``ubuntu-server``

* Ubuntu desktop:
* Ubuntu Desktop:

* minimal (default): ``ubuntu-desktop-minimal``
* standard: ``ubuntu-desktop``
Expand Down Expand Up @@ -300,18 +296,18 @@ source examples:
.. code-block:: yaml
autoinstall:
# default behavior
# default behaviour
source:
search_drivers: true
id: <the install source marked as default in install-sources.yaml>
id: <the installation source marked as default in install-sources.yaml>
autoinstall:
# on the ubuntu-server ISO, install with the minimal source
# on the Ubuntu Server ISO, install with the minimal source
source:
id: ubuntu-server-minimal
autoinstall:
# on the Ubuntu desktop ISO, install with the standard source
# on the Ubuntu Desktop ISO, install with the standard source
source:
id: ubuntu-desktop
Expand Down Expand Up @@ -820,9 +816,7 @@ install-server
* **type:** boolean
* **default:** ``false``

Whether to install the OpenSSH server in the target system. Note that Desktop
install ISOs do not include openssh-server on the ISO, so installs of
Desktop require Ubuntu archive access for install-server to be successful.
Whether to install the OpenSSH server in the target system. Note that Desktop installation ISOs do not include ``openssh-server``, so installations of Desktop require Ubuntu archive access for ``install-server`` to be successful.

authorized-keys
^^^^^^^^^^^^^^^
Expand All @@ -838,12 +832,12 @@ allow-pw
* **type:** boolean
* **default:** ``true`` if ``authorized_keys`` is empty, ``false`` otherwise

ssh examples:
``ssh`` examples:

.. code-block:: yaml
autoinstall:
# default behavior
# default behaviour
ssh:
install-server: false
authorized-keys: []
Expand Down Expand Up @@ -1044,7 +1038,7 @@ shutdown examples:
.. code-block:: yaml
autoinstall:
# default behavior
# default behaviour
shutdown: reboot
autoinstall:
Expand Down

0 comments on commit 6263225

Please sign in to comment.