chore: add in recent changes

adds changes from BobyMCbobs' repo
ii · Nov 16, 2023 · e36be4a · e36be4a
1 parent f1b4e3c
commit e36be4a
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -152,7 +152,7 @@ jobs:
             RECIPE=${{ matrix.recipe }}
             IMAGE_REGISTRY=${{ steps.registry_case.outputs.lowercase }}
           labels: ${{ steps.meta.outputs.labels }}
-          oci: false
+          oci: true
 
       # Push the image to GHCR (Image Registry)
       - name: Push To GHCR

diff --git a/config/files/usr/lib/bootc/install/00-u.toml b/config/files/usr/lib/bootc/install/00-u.toml
@@ -0,0 +1,2 @@
+[install]
+root-fs-type = "btrfs"
diff --git a/config/recipe.yml b/config/recipe.yml
@@ -20,12 +20,25 @@ modules:
                   # should be added into /usr/etc/ as that is the proper "distro"
                   # config directory on ostree. Read more in the files module's README
 
+  - type: script
+    scripts:
+      # this sets up the proper policy & signing files for signed images to work
+      - enable-testing-repo.sh
   - type: rpm-ostree
     repos:
       # - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%OS_VERSION%/atim-starship-fedora-%OS_VERSION%.repo
     install:
       # - micro
       # - starship
+      - vim
+      - gdisk
+      - bootupd
+      - grub2
+      - ostree-grub2
+      - grub2-efi-x64
+      - efibootmgr
+      - nc
+      - cloud-utils
     remove:
       # - firefox # default firefox removed in favor of flatpak
       # - firefox-langpacks # langpacks needs to also be removed to prevent dependency problems
@@ -45,10 +58,15 @@ modules:
     custom-flatpaks: # this section is optional
       # - Celluloid: io.github.celluloid_player.Celluloid
       # - Krita: org.kde.krita
+      - Firefox: org.mozilla.firefox
+      - Slack: com.slack.Slack
       - Scratch: edu.mit.Scratch 
       - SonicPi: net.sonic_pi.SonicPi
 
   - type: script
     scripts:
       # this sets up the proper policy & signing files for signed images to work
       - signing.sh
+  - type: script
+    scripts:
+      - bootupctl-update-metadata.sh
diff --git a/config/scripts/bootupctl-update-metadata.sh b/config/scripts/bootupctl-update-metadata.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+bootupctl backend generate-update-metadata
diff --git a/config/scripts/enable-testing-repo.sh b/config/scripts/enable-testing-repo.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -oue pipefail
+
+echo ">>>>>> ENABLING TEST REPO <<<<<<"
+sed -i -e '0,/enabled=0/s//enabled=1/' /etc/yum.repos.d/fedora-updates-testing.repo
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/bash

		bootupctl backend generate-update-metadata