-
Notifications
You must be signed in to change notification settings - Fork 155
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
doc: update autoinstall reference's apt section #2060
doc: update autoinstall reference's apt section #2060
Conversation
|
||
.. code-block:: yaml | ||
|
||
# Use custom mirrors for all architectures. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The comment makes it sound like both CUSTOM_MIRROR_* will be used ; while in practice the latter will be used only if the former fails validation. Can we make that clearer somehow?
suggestion:
# Use the first custom mirror that seems to work. Do not restrict to specific architectures.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I like your suggestion but with a minor tweak.
# Use the first custom mirror that works. Do not restrict to specific architectures.
|
||
- 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. | ||
|
||
- The ``fallback`` key controls what Subiquity does when no primary mirror is usable. | ||
|
||
- The ``geoip`` key controls whether to perform IP-based geolocation to determine the correct country mirror. | ||
|
||
The default is: | ||
|
||
All other sections behave as defined in curtin. See the curtin `documentation <https://curtin.readthedocs.io/en/latest/topics/apt_source.html#common-snippets>`_ and its `example apt configurations <https://git.launchpad.net/curtin/tree/examples/apt-source.yaml>`_ for usage examples of these sections. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe mention that it covers adding a PPA? I think it's a common use-case and people will be confused if they can't find the example anymore.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, I think that makes sense. I updated the text a bit, wdyt?
The `primary` sub-section here refers to the `primary` section that is nested under `mirror-selection`. Change this to a sub-section so it also shows up that way in the docs navigator.
Reword the mirror-selection: primary section to be more explicit and to also link to the list of valid mirrors. Also rework all examples of this section to use URI first.
068b803
to
6fad8c7
Compare
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
6fad8c7
to
668456f
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, LGTM
General formatting updates, add example sections for each sub-key, and add links to advanced usage examples in curtin.
Also, because I think the reference here should focus on the parts where Subiquity and Curtin's apt sections differ and not repeating Curtin doc of the section, I removed the "add a PPA" example. I do think it's a good example though, so I opened a PR [1] in Curtin to add it to the common snippet's section.
[1] https://code.launchpad.net/~cpete/curtin/+git/curtin/+merge/471552