Skip to content

Commit 2b1ca62

Browse files
committed
fixup! osbuild/ bootc-install: symlink aleph files
1 parent 93ff61b commit 2b1ca62

File tree

1 file changed

+50
-10
lines changed

1 file changed

+50
-10
lines changed

src/osbuild-manifests/coreos.osbuild.x86_64.bootc.mpp.yaml

Lines changed: 50 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -267,11 +267,20 @@ pipelines:
267267
- type: org.osbuild.bootc.install-to-filesystem
268268
inputs:
269269
images:
270-
type: org.osbuild.containers
271-
origin: org.osbuild.pipeline
272-
references:
273-
name:oci-archive:
274-
name: coreos.ociarchive
270+
mpp-if: ociarchive != ''
271+
then:
272+
type: org.osbuild.containers
273+
origin: org.osbuild.pipeline
274+
references:
275+
name:oci-archive:
276+
name: coreos.ociarchive
277+
else:
278+
type: org.osbuild.containers
279+
origin: org.osbuild.source
280+
mpp-resolve-images:
281+
images:
282+
- source: $container_repo
283+
tag: $container_tag
275284
options:
276285
kernel-args:
277286
- '$ignition_firstboot'
@@ -468,11 +477,20 @@ pipelines:
468477
- type: org.osbuild.bootc.install-to-filesystem
469478
inputs:
470479
images:
471-
type: org.osbuild.containers
472-
origin: org.osbuild.pipeline
473-
references:
474-
name:oci-archive:
475-
name: coreos.ociarchive
480+
mpp-if: ociarchive != ''
481+
then:
482+
type: org.osbuild.containers
483+
origin: org.osbuild.pipeline
484+
references:
485+
name:oci-archive:
486+
name: coreos.ociarchive
487+
else:
488+
type: org.osbuild.containers
489+
origin: org.osbuild.source
490+
mpp-resolve-images:
491+
images:
492+
- source: $container_repo
493+
tag: $container_tag
476494
options:
477495
kernel-args:
478496
- '$ignition_firstboot'
@@ -538,6 +556,28 @@ pipelines:
538556
partition:
539557
mpp-format-int: '{image4k.layout[''boot''].partnum}'
540558
target: /boot
559+
- type: org.osbuild.symlink
560+
options:
561+
paths:
562+
- source: ".bootc-aleph.json"
563+
link: "mount://root/.coreos-aleph-version.json"
564+
- source: ".bootc-aleph.json"
565+
link: "mount://root/.aleph-version.json"
566+
devices:
567+
disk:
568+
type: org.osbuild.loopback
569+
options:
570+
filename: disk.img
571+
partscan: true
572+
sector-size:
573+
mpp-format-int: "{four_k_sector_size}"
574+
mounts:
575+
- name: root
576+
type: org.osbuild.xfs
577+
source: disk
578+
partition:
579+
mpp-format-int: '{image4k.layout[''root''].partnum}'
580+
target: /
541581
- mpp-import-pipelines:
542582
path: platform.aliyun.ipp.yaml
543583
- mpp-import-pipelines:

0 commit comments

Comments
 (0)