From 6fad8c737d8e81c1d1769bc43810bd086ef572dd Mon Sep 17 00:00:00 2001 From: Chris Peterson Date: Mon, 19 Aug 2024 17:26:43 -0700 Subject: [PATCH] doc: apt reference curtin usage examples Remove the example for adding a PPA since introducing it in curtin's common snippet's section in [1]. Guide users to the official curtin documentation for examples of curtin specific behavior. [1] https://code.launchpad.net/~cpete/curtin/+git/curtin/+merge/471552 --- doc/reference/autoinstall-reference.rst | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/doc/reference/autoinstall-reference.rst b/doc/reference/autoinstall-reference.rst index 301b2c1ac..b0bdaadfa 100644 --- a/doc/reference/autoinstall-reference.rst +++ b/doc/reference/autoinstall-reference.rst @@ -392,7 +392,7 @@ apt APT configuration, used both during the installation and once booted into the target system. -This section historically used the same format as curtin, which is documented in the `APT Source `_ section of the curtin documentation. Nonetheless, some key differences with the format supported by curtin have been introduced: +This section has historically used the same format as curtin, which is documented in the `APT Source `_ section of the curtin documentation. Nonetheless, some key differences with the format supported by curtin have been introduced: - Subiquity supports an alternative format for the ``primary`` section, allowing configuration of a list of candidate primary mirrors. During installation, Subiquity automatically tests the specified mirrors and selects the first one that appears usable. This new behaviour is only activated when the ``primary`` section is wrapped in the ``mirror-selection`` section. @@ -400,7 +400,10 @@ This section historically used the same format as curtin, which is documented in - The ``geoip`` key controls whether to perform IP-based geolocation to determine the correct country mirror. -The default apt configuration is equivalent to: + +All other sections behave as defined in curtin. See the curtin `documentation `_ and its `example apt configurations `_ for usage examples of these sections (like how to add a PPA). + +The default apt configuration in Subiquity is equivalent to: .. code-block:: yaml @@ -520,16 +523,6 @@ Examples: geoip: false -To add a PPA: - -.. code-block:: yaml - - autoinstall: - apt: - sources: - curtin-ppa: - source: ppa:curtin-dev/test-archive - .. _ai-storage: storage