curtin-dev team mailing list archive

[Akira Tanaka <mp+462708@xxxxxxxxxxxxxxxxxx>]

Akira Tanaka has proposed merging ~popo1897/curtin:fix-apt-source-example into curtin:master.

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

Requested reviews:
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~popo1897/curtin/+git/curtin/+merge/462708

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
```
-- 
Your team curtin developers is requested to review the proposed merge of ~popo1897/curtin:fix-apt-source-example into curtin:master.

diff --git a/examples/apt-source.yaml b/examples/apt-source.yaml
index 30e30a2..8480c58 100644
--- a/examples/apt-source.yaml
+++ b/examples/apt-source.yaml
@@ -99,8 +99,9 @@ apt:
       # as above, allowing to have one config for different per arch mirrors
   # security is optional, if not defined it is set to the same value as primary
   security:
-    uri: http://security.ubuntu.com/ubuntu
-    # [...]
+        - arches: [amd64, i386, default]
+          uri: http://security.ubuntu.com/ubuntu
+        # [...]
 
   # if no mirrors are specified at all, or all lookups fail it will use:
   # primary: http://archive.ubuntu.com/ubuntu