curtin

Merge ~popo1897/curtin:fix-apt-source-example into ~curtin-dev/curtin:master

  1. Git
  2. lp:~popo1897/curtin
  3. fix-apt-source-example
  4. Merge into master
Proposed by Akira Tanaka
Status: Needs review
Proposed branch: ~popo1897/curtin:fix-apt-source-example
Merge into: ~curtin-dev/curtin:master
Diff against target: 14 lines (+2/-1)
1 file modified
examples/apt-source.yaml (+2/-1)
Reviewer Review Type Date Requested Status
curtin developers Pending
Review via email: mp+462708@code.launchpad.net

Commit message

Fix the structure of "security" in examples/apt-source.yaml

Description of the change

The `security` in examples/apt-source.yaml needs arch like `primary`.

Actually, the content of /var/log/installer/subiquity-curtin-apt.conf generated by manual installation for Ubuntu 22.04.4 is below:
```
# Autogenerated by Subiquity: 2024-03-19 15:39:12.974186 UTC
apt:
  debconf_selections:
    subiquity: ''
  disable_components: []
  preserve_sources_list: false
  primary:
  - arches:
    - default
    uri: http://jp.archive.ubuntu.com/ubuntu/
  security:
  - arches:
    - amd64
    - i386
    uri: http://security.ubuntu.com/ubuntu/
  - arches:
    - s390x
    - arm64
    - armhf
    - powerpc
    - ppc64el
    - riscv64
    uri: http://ports.ubuntu.com/ubuntu-ports
```

To post a comment you must log in.
~popo1897/curtin:fix-apt-source-example updated
304839b... by Akira Tanaka

Fix the structure of "security" in examples/apt-source.yaml

Unmerged commits

304839b... by Akira Tanaka

Fix the structure of "security" in examples/apt-source.yaml

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/examples/apt-source.yaml b/examples/apt-source.yaml
2index 30e30a2..0fa2a08 100644
3--- a/examples/apt-source.yaml
4+++ b/examples/apt-source.yaml
5@@ -99,7 +99,8 @@ apt:
6 # as above, allowing to have one config for different per arch mirrors
7 # security is optional, if not defined it is set to the same value as primary
8 security:
9- uri: http://security.ubuntu.com/ubuntu
10+ - arches: [amd64, i386, default]
11+ uri: http://security.ubuntu.com/ubuntu
12 # [...]
13
14 # if no mirrors are specified at all, or all lookups fail it will use:

Subscribers

People subscribed via source and target branches