Skip to content

Commit ade15b9

Browse files
committed
osbuild: copy in platforms.json into /boot
This is something create_disk.sh was doing that we weren't in the OSBuild flow today. It will make it so `coreos-installer` can pick up and use this information when performing installs and should support the efforts to make the ext.config.files.console-config test start passing again. xref coreos/fedora-coreos-tracker#1654
1 parent 30bce85 commit ade15b9

4 files changed

+84
-0
lines changed

src/coreos.osbuild.aarch64.mpp.yaml

+21
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,12 @@ pipelines:
111111
paths:
112112
- path: /boot/efi
113113
mode: 448
114+
# platforms.json will live here
115+
- type: org.osbuild.mkdir
116+
options:
117+
paths:
118+
- path: /boot/coreos
119+
mode: 644
114120
- type: org.osbuild.ignition
115121
# Deploy via container if we have a container ociarchive, else from repo.
116122
- mpp-if: ociarchive != ''
@@ -168,6 +174,21 @@ pipelines:
168174
ref: ostree/1/1/0
169175
osname:
170176
mpp-format-string: '{osname}'
177+
# Copy in the platforms.json that was baked into the OSTree into /boot
178+
# so tools like coreos-installer can use the information.
179+
- type: org.osbuild.copy
180+
options:
181+
paths:
182+
- from: tree:///usr/share/coreos-assembler/platforms.json
183+
to: tree:///boot/coreos/platforms.json
184+
mounts:
185+
- name: ostree.deployment
186+
type: org.osbuild.ostree.deployment
187+
options:
188+
deployment:
189+
ref: ostree/1/1/0
190+
osname:
191+
mpp-format-string: '{osname}'
171192
- name: raw-image
172193
stages:
173194
- type: org.osbuild.truncate

src/coreos.osbuild.ppc64le.mpp.yaml

+21
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,12 @@ pipelines:
108108
bootloader: none
109109
# https://github.com/coreos/fedora-coreos-tracker/issues/1333
110110
bls-append-except-default: grub_users=""
111+
# platforms.json will live here
112+
- type: org.osbuild.mkdir
113+
options:
114+
paths:
115+
- path: /boot/coreos
116+
mode: 644
111117
- type: org.osbuild.ignition
112118
# Deploy via container if we have a container ociarchive, else from repo.
113119
- mpp-if: ociarchive != ''
@@ -178,6 +184,21 @@ pipelines:
178184
ref: ostree/1/1/0
179185
osname:
180186
mpp-format-string: '{osname}'
187+
# Copy in the platforms.json that was baked into the OSTree into /boot
188+
# so tools like coreos-installer can use the information.
189+
- type: org.osbuild.copy
190+
options:
191+
paths:
192+
- from: tree:///usr/share/coreos-assembler/platforms.json
193+
to: tree:///boot/coreos/platforms.json
194+
mounts:
195+
- name: ostree.deployment
196+
type: org.osbuild.ostree.deployment
197+
options:
198+
deployment:
199+
ref: ostree/1/1/0
200+
osname:
201+
mpp-format-string: '{osname}'
181202
- name: raw-image
182203
stages:
183204
- type: org.osbuild.truncate

src/coreos.osbuild.s390x.mpp.yaml

+21
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,12 @@ pipelines:
9595
bootloader: none
9696
## no grub_users="" on s390x
9797
#bls-append-except-default: grub_users=""
98+
# platforms.json will live here
99+
- type: org.osbuild.mkdir
100+
options:
101+
paths:
102+
- path: /boot/coreos
103+
mode: 644
98104
- type: org.osbuild.ignition
99105
# Deploy via container if we have a container ociarchive, else from repo.
100106
- mpp-if: ociarchive != ''
@@ -176,6 +182,21 @@ pipelines:
176182
ref: ostree/1/1/0
177183
osname:
178184
mpp-format-string: '{osname}'
185+
# Copy in the platforms.json that was baked into the OSTree into /boot
186+
# so tools like coreos-installer can use the information.
187+
- type: org.osbuild.copy
188+
options:
189+
paths:
190+
- from: tree:///usr/share/coreos-assembler/platforms.json
191+
to: tree:///boot/coreos/platforms.json
192+
mounts:
193+
- name: ostree.deployment
194+
type: org.osbuild.ostree.deployment
195+
options:
196+
deployment:
197+
ref: ostree/1/1/0
198+
osname:
199+
mpp-format-string: '{osname}'
179200
- name: raw-image
180201
stages:
181202
- type: org.osbuild.truncate

src/coreos.osbuild.x86_64.mpp.yaml

+21
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,12 @@ pipelines:
113113
paths:
114114
- path: /boot/efi
115115
mode: 448
116+
# platforms.json will live here
117+
- type: org.osbuild.mkdir
118+
options:
119+
paths:
120+
- path: /boot/coreos
121+
mode: 644
116122
- type: org.osbuild.ignition
117123
# Deploy via container if we have a container ociarchive, else from repo.
118124
- mpp-if: ociarchive != ''
@@ -170,6 +176,21 @@ pipelines:
170176
ref: ostree/1/1/0
171177
osname:
172178
mpp-format-string: '{osname}'
179+
# Copy in the platforms.json that was baked into the OSTree into /boot
180+
# so tools like coreos-installer can use the information.
181+
- type: org.osbuild.copy
182+
options:
183+
paths:
184+
- from: tree:///usr/share/coreos-assembler/platforms.json
185+
to: tree:///boot/coreos/platforms.json
186+
mounts:
187+
- name: ostree.deployment
188+
type: org.osbuild.ostree.deployment
189+
options:
190+
deployment:
191+
ref: ostree/1/1/0
192+
osname:
193+
mpp-format-string: '{osname}'
173194
- name: raw-image
174195
stages:
175196
- type: org.osbuild.truncate

0 commit comments

Comments
 (0)