Merge branch 'master' into live

vietchinh · Nov 7, 2023 · 9a05a2d · 9a05a2d
2 parents bad42ef + b5a8ea8
commit 9a05a2d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 19 deletions.
diff --git a/Containerfile b/Containerfile
@@ -42,6 +42,8 @@ COPY modules /tmp/modules/
 # It is copied from the official container image since it's not available as an RPM.
 COPY --from=docker.io/mikefarah/yq /usr/bin/yq /usr/bin/yq
 
+COPY --from=ghcr.io/ublue-os/config:latest /rpms/ublue-os-signing.noarch.rpm /tmp/
+
 # Run the build script, then clean up temp files and finalize container build.
 RUN chmod +x /tmp/build.sh && /tmp/build.sh \
     && rm -rf /tmp/* /var/* && rpm-ostree cleanup -m && ostree container commit
diff --git a/config/recipe-ucore-zfs-light.yml b/config/recipe-ucore-zfs-light.yml
@@ -42,9 +42,9 @@ modules:
 
   - type: script
     scripts:
+      - ucore.sh
       # this sets up the proper policy & signing files for signed images to work
       - signing.sh
-      - ucore-systemd.sh
 
   - type: systemd
     system:

diff --git a/config/scripts/kinoite-cachyos-kernel-bore-eevdf.sh b/config/scripts/kinoite-cachyos-kernel-bore-eevdf.sh
diff --git a/config/scripts/kinoite.sh b/config/scripts/kinoite.sh
diff --git a/config/scripts/ucore-systemd.sh → config/scripts/ucore.sh b/config/scripts/ucore-systemd.sh → config/scripts/ucore.sh
@@ -31,3 +31,5 @@ Persistent=true
 [Install]
 WantedBy=timers.target
 EOF
+
+rpm -ivh /tmp/ublue-os-signing.noarch.rpm