Skip to content

Commit

Permalink
fix userdata
Browse files Browse the repository at this point in the history
Signed-off-by: Nianyu Shen <[email protected]>
  • Loading branch information
nianyush committed Mar 8, 2024
1 parent 5c4bd91 commit 56b79f0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
10 changes: 5 additions & 5 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ build-uki-iso:
ENV ISO_NAME=${ISO_NAME}
COPY overlay/files-iso/ /overlay/
COPY --if-exists user-data /overlay/config.yaml
COPY --if-exists user-data /overlay/data/config.yaml
COPY --platform=linux/${ARCH} +stylus-image-pack/stylus-image.tar /overlay/data/stylus-image.tar
COPY --platform=linux/${ARCH} +luet/luet /overlay/data/luet

Expand Down Expand Up @@ -364,10 +365,10 @@ build-provider-trustedboot-image:

stylus-image:
FROM $STYLUS_BASE
SAVE ARTIFACT ./*
SAVE ARTIFACT /etc/kairos/branding
SAVE ARTIFACT /etc/elemental/config.yaml
SAVE ARTIFACT /oem/stylus_config.yaml
SAVE ARTIFACT --keep-own ./*
# SAVE ARTIFACT /etc/kairos/branding
# SAVE ARTIFACT /etc/elemental/config.yaml
# SAVE ARTIFACT /oem/stylus_config.yaml

kairos-provider-image:
IF [ "$K8S_DISTRIBUTION" = "kubeadm" ]
Expand Down Expand Up @@ -520,7 +521,6 @@ iso-image:
IF [ "$IS_UKI" = "false" ]
COPY --platform=linux/${ARCH} +stylus-image/ /
ELSE
COPY +luet/luet /usr/bin/luet
COPY --platform=linux/${ARCH} +stylus-image/ /
RUN rm -rf /opt/spectrocloud/bin
RUN rm -f /usr/bin/luet
Expand Down
3 changes: 2 additions & 1 deletion stylus_uki.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ users:

stages:
after-install:
- commands:
- name: uki stylus unpack
commands:
- echo "Copying files to persistent path"
- /usr/lib/systemd/systemd-cryptsetup attach persistent $(findfs PARTLABEL=persistent) - tpm2-device=auto
- mountpoint="/usr/local" && ! findmnt -rno TARGET "$mountpoint" > /dev/null && mount /dev/mapper/persistent "$mountpoint" || echo "Already mounted."
Expand Down

0 comments on commit 56b79f0

Please sign in to comment.