refactor initramfs regeneration to be at the end of each build

files/scripts/regenerateinitramfs.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+
+rpm-ostree cliwrap install-to-root /
+
+QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')"
+/usr/libexec/rpm-ostree/wrapped/dracut --no-hostonly --kver "$QUALIFIED_KERNEL" --reproducible -v --add ostree -f "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
+chmod 0600 "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"

files/scripts/setearlyloading.sh

@@ -5,9 +5,3 @@ set -oue pipefail
 
 sed -i 's@omit_drivers@force_drivers@g' /usr/lib/dracut/dracut.conf.d/99-nvidia.conf
 sed -i 's@ nvidia @ i915 amdgpu nvidia @g' /usr/lib/dracut/dracut.conf.d/99-nvidia.conf
-
-rpm-ostree cliwrap install-to-root /
-
-QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')"
-/usr/libexec/rpm-ostree/wrapped/dracut --no-hostonly --kver "$QUALIFIED_KERNEL" --reproducible -v --add ostree -f "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
-chmod 0600 "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"

recipes/common/common-modules.yml

@@ -10,7 +10,6 @@ modules:
     - type: script
       scripts:
         - installsignedkernel.sh
-        - removeunusedrepos.sh
 
     - type: containerfile
       snippets:

recipes/common/final-modules.yml

@@ -0,0 +1,5 @@
+modules:
+    - type: script
+      scripts:
+        - removeunusedrepos.sh
+        - regenerateinitramfs.sh

recipes/common/nvidia-modules.yml

@@ -10,6 +10,5 @@ modules:
   - type: script
     scripts:
       - installnvidiatoolkitpolicy.sh
-      - removeunusedrepos.sh
       - setearlyloading.sh
       - setdrmvariables.sh

recipes/common/nvidia-open-modules.yml

@@ -10,6 +10,5 @@ modules:
   - type: script
     scripts:
       - installnvidiatoolkitpolicy.sh
-      - removeunusedrepos.sh
       - setearlyloading.sh
       - setdrmvariables.sh

recipes/recipe-hyprland-gdm.yml

@@ -10,3 +10,4 @@ modules:
   - from-file: common/common-modules.yml
   - from-file: common/gdm-modules.yml
   - from-file: common/hyprland-modules.yml
+  - from-file: common/final-modules.yml

recipes/recipe-hyprland-nvidia-gdm.yml

@@ -11,3 +11,4 @@ modules:
   - from-file: common/nvidia-modules.yml
   - from-file: common/gdm-modules.yml
   - from-file: common/hyprland-modules.yml
+  - from-file: common/final-modules.yml

recipes/recipe-hyprland-nvidia-open-gdm.yml

@@ -11,3 +11,4 @@ modules:
   - from-file: common/nvidia-open-modules.yml
   - from-file: common/gdm-modules.yml
   - from-file: common/hyprland-modules.yml
+  - from-file: common/final-modules.yml

recipes/recipe-hyprland-nvidia-open.yml

@@ -11,3 +11,4 @@ modules:
   - from-file: common/common-modules.yml
   - from-file: common/nvidia-open-modules.yml
   - from-file: common/hyprland-modules.yml
+  - from-file: common/final-modules.yml

recipes/recipe-hyprland-nvidia.yml

@@ -11,3 +11,4 @@ modules:
   - from-file: common/common-modules.yml
   - from-file: common/nvidia-modules.yml
   - from-file: common/hyprland-modules.yml
+  - from-file: common/final-modules.yml

recipes/recipe-hyprland.yml

@@ -10,3 +10,4 @@ modules:
   - from-file: common/sddm-modules.yml
   - from-file: common/common-modules.yml
   - from-file: common/hyprland-modules.yml
+  - from-file: common/final-modules.yml

recipes/recipe-river-gdm.yml

@@ -10,3 +10,4 @@ modules:
   - from-file: common/common-modules.yml
   - from-file: common/gdm-modules.yml
   - from-file: common/river-modules.yml
+  - from-file: common/final-modules.yml

recipes/recipe-river-nvidia-gdm.yml

@@ -11,3 +11,4 @@ modules:
   - from-file: common/nvidia-modules.yml
   - from-file: common/gdm-modules.yml
   - from-file: common/river-modules.yml
+  - from-file: common/final-modules.yml

recipes/recipe-river-nvidia-open-gdm.yml

@@ -11,3 +11,4 @@ modules:
   - from-file: common/nvidia-open-modules.yml
   - from-file: common/gdm-modules.yml
   - from-file: common/river-modules.yml
+  - from-file: common/final-modules.yml

recipes/recipe-river-nvidia-open.yml

@@ -11,3 +11,4 @@ modules:
   - from-file: common/common-modules.yml
   - from-file: common/nvidia-open-modules.yml
   - from-file: common/river-modules.yml
+  - from-file: common/final-modules.yml

recipes/recipe-river-nvidia.yml

@@ -11,3 +11,4 @@ modules:
   - from-file: common/common-modules.yml
   - from-file: common/nvidia-modules.yml
   - from-file: common/river-modules.yml
+  - from-file: common/final-modules.yml

recipes/recipe-river.yml

@@ -10,3 +10,4 @@ modules:
   - from-file: common/sddm-modules.yml
   - from-file: common/common-modules.yml
   - from-file: common/river-modules.yml
+  - from-file: common/final-modules.yml

recipes/recipe-sway-gdm.yml

@@ -11,3 +11,4 @@ modules:
   - from-file: common/common-modules.yml
   - from-file: common/gdm-modules.yml
   - from-file: common/sway-modules.yml
+  - from-file: common/final-modules.yml

recipes/recipe-sway-nvidia-gdm.yml

@@ -14,4 +14,5 @@ modules:
   - from-file: common/sway-modules.yml
   - type: script
     scripts:
-      - setswaynvidiaenvironment.sh
+      - setswaynvidiaenvironment.sh
+  - from-file: common/final-modules.yml

recipes/recipe-sway-nvidia-open-gdm.yml

@@ -14,4 +14,5 @@ modules:
   - from-file: common/sway-modules.yml
   - type: script
     scripts:
-      - setswaynvidiaenvironment.sh
+      - setswaynvidiaenvironment.sh
+  - from-file: common/final-modules.yml

recipes/recipe-sway-nvidia-open.yml

@@ -13,4 +13,5 @@ modules:
   - from-file: common/sway-modules.yml
   - type: script
     scripts:
-      - setswaynvidiaenvironment.sh
+      - setswaynvidiaenvironment.sh
+  - from-file: common/final-modules.yml

recipes/recipe-sway-nvidia.yml

@@ -13,4 +13,5 @@ modules:
   - from-file: common/sway-modules.yml
   - type: script
     scripts:
-      - setswaynvidiaenvironment.sh
+      - setswaynvidiaenvironment.sh
+  - from-file: common/final-modules.yml

recipes/recipe-sway.yml

@@ -10,3 +10,4 @@ modules:
   - from-file: common/sddm-modules.yml
   - from-file: common/common-modules.yml
   - from-file: common/sway-modules.yml
+  - from-file: common/final-modules.yml

recipes/recipe-wayfire-gdm.yml

@@ -10,4 +10,5 @@ modules:
   - from-file: common/common-modules.yml
   - from-file: common/gdm-modules.yml
   - from-file: common/wayfire-modules.yml
+  - from-file: common/final-modules.yml
 

recipes/recipe-wayfire-nvidia-gdm.yml

@@ -11,3 +11,4 @@ modules:
   - from-file: common/nvidia-modules.yml
   - from-file: common/gdm-modules.yml
   - from-file: common/wayfire-modules.yml
+  - from-file: common/final-modules.yml

recipes/recipe-wayfire-nvidia-open-gdm.yml

@@ -11,3 +11,4 @@ modules:
   - from-file: common/nvidia-open-modules.yml
   - from-file: common/gdm-modules.yml
   - from-file: common/wayfire-modules.yml
+  - from-file: common/final-modules.yml

recipes/recipe-wayfire-nvidia-open.yml

@@ -11,3 +11,4 @@ modules:
   - from-file: common/common-modules.yml
   - from-file: common/nvidia-open-modules.yml
   - from-file: common/wayfire-modules.yml
+  - from-file: common/final-modules.yml

recipes/recipe-wayfire-nvidia.yml

@@ -11,3 +11,4 @@ modules:
   - from-file: common/common-modules.yml
   - from-file: common/nvidia-modules.yml
   - from-file: common/wayfire-modules.yml
+  - from-file: common/final-modules.yml

recipes/recipe-wayfire.yml

@@ -10,3 +10,4 @@ modules:
   - from-file: common/sddm-modules.yml
   - from-file: common/common-modules.yml
   - from-file: common/wayfire-modules.yml
+  - from-file: common/final-modules.yml