chore: switch rechunked images to hardened_malloc-light and demote them to experimental

README.md

@@ -115,42 +115,42 @@ While it's recommended to use a Fedora Atomic iso to install and then rebase tha
 ### Stable
 - `kinoite-main-hardened`
 - `kinoite-nvidia-hardened`
-- `aurora-main-hardened`
-- `aurora-nvidia-hardened`
-- `sericea-main-hardened`
-- `sericea-nvidia-hardened`
 - `kinoite-main-userns-hardened`
 - `kinoite-nvidia-userns-hardened`
+- `sericea-main-hardened`
+- `sericea-nvidia-hardened`
+- `sericea-main-userns-hardened`
+- `sericea-nvidia-userns-hardened`
+### Beta
+- `wayblue-wayfire-main-hardened`
+- `wayblue-wayfire-nvidia-hardened`
+- `wayblue-wayfire-main-userns-hardened`
+- `wayblue-wayfire-nvidia-userns-hardened`
+- `wayblue-hyprland-main-hardened`
+- `wayblue-hyprland-nvidia-hardened`
+- `wayblue-hyprland-main-userns-hardened`
+- `wayblue-hyprland-nvidia-userns-hardened`
+- `wayblue-river-main-hardened`
+- `wayblue-river-nvidia-hardened`
+- `wayblue-river-main-userns-hardened`
+- `wayblue-river-nvidia-userns-hardened`
+- `wayblue-sway-main-hardened`
+- `wayblue-sway-nvidia-hardened`
+- `wayblue-sway-main-userns-hardened`
+- `wayblue-sway-nvidia-userns-hardened`
+### Experimental 
+- `aurora-main-hardened`
+- `aurora-nvidia-hardened`
 - `aurora-main-userns-hardened`
 - `aurora-nvidia-userns-hardened`
 - `aurora-dx-main-userns-hardened`
 - `aurora-dx-nvidia-userns-hardened`
-- `sericea-main-userns-hardened`
-- `sericea-nvidia-userns-hardened`
 - `bluefin-main-hardened`
 - `bluefin-nvidia-hardened`
 - `bluefin-dx-main-userns-hardened`
 - `bluefin-dx-nvidia-userns-hardened`
 - `bluefin-main-userns-hardened`
 - `bluefin-nvidia-userns-hardened`
-### Beta
-- `wayblue-wayfire-main-hardened`
-- `wayblue-wayfire-nvidia-hardened`
-- `wayblue-hyprland-main-hardened`
-- `wayblue-hyprland-nvidia-hardened`
-- `wayblue-river-main-hardened`
-- `wayblue-river-nvidia-hardened`
-- `wayblue-sway-main-hardened`
-- `wayblue-sway-nvidia-hardened`
-- `wayblue-wayfire-main-userns-hardened`
-- `wayblue-wayfire-nvidia-userns-hardened`
-- `wayblue-hyprland-main-userns-hardened`
-- `wayblue-hyprland-nvidia-userns-hardened`
-- `wayblue-river-main-userns-hardened`
-- `wayblue-river-nvidia-userns-hardened`
-- `wayblue-sway-main-userns-hardened`
-- `wayblue-sway-nvidia-userns-hardened`
-### Experimental
 - `cinnamon-main-hardened`
 - `cinnamon-nvidia-hardened`
 - `cinnamon-main-userns-hardened`
@@ -164,16 +164,16 @@ While it's recommended to use a Fedora Atomic iso to install and then rebase tha
 - `silverblue-asus-nvidia-hardened`
 - `silverblue-asus-userns-hardened`
 - `silverblue-asus-nvidia-userns-hardened`
-- `aurora-asus-hardened`
-- `aurora-asus-nvidia-hardened`
 - `kinoite-asus-hardened`
 - `kinoite-asus-nvidia-hardened`
+- `kinoite-asus-userns-hardened`
+- `kinoite-asus-nvidia-userns-hardened`
+- `aurora-asus-hardened`
+- `aurora-asus-nvidia-hardened`
 - `aurora-asus-userns-hardened`
 - `aurora-asus-nvidia-userns-hardened`
 - `aurora-dx-asus-userns-hardened`
 - `aurora-dx-asus-nvidia-userns-hardened`
-- `kinoite-asus-userns-hardened`
-- `kinoite-asus-nvidia-userns-hardened`
 ### Surface <sup>[source](https://github.com/ublue-os/hwe/tree/main/surface)</sup>
 - `aurora-surface-hardened`
 - `aurora-surface-nvidia-hardened`
@@ -184,10 +184,10 @@ While it's recommended to use a Fedora Atomic iso to install and then rebase tha
 ## Server
 - `securecore-main-hardened`
 - `securecore-nvidia-hardened`
-- `securecore-zfs-main-hardened`
-- `securecore-zfs-nvidia-hardened`
 - `securecore-main-userns-hardened`
 - `securecore-nvidia-userns-hardened`
+- `securecore-zfs-main-hardened`
+- `securecore-zfs-nvidia-hardened`
 - `securecore-zfs-main-userns-hardened`
 - `securecore-zfs-nvidia-userns-hardened`
   

files/scripts/justfilehardening.sh

@@ -2,6 +2,6 @@
 
 # Tell build process to exit if there are any errors.
 set -oue pipefail
-\
+
 patch /usr/share/ublue-os/just/15-luks.just < use-pkexec-in-luks-just.patch
 patch /usr/share/ublue-os/just/40-nvidia.just < remove-unusable-just-command.patch

files/scripts/usehardenedmalloclight.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+sed -i 's/libhardened_malloc.so/libhardened_malloc-light.so/' /etc/ld.so.preload

recipes/asus/recipe-aurora-asus-nvidia-userns.yml

@@ -12,7 +12,7 @@ modules:
   - from-file: common/aurora-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
   - from-file: common/kinoite-files.yml

recipes/asus/recipe-aurora-asus-nvidia.yml

@@ -12,7 +12,7 @@ modules:
   - from-file: common/aurora-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml

recipes/asus/recipe-aurora-asus-userns.yml

@@ -12,7 +12,7 @@ modules:
   - from-file: common/aurora-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
   - from-file: common/kinoite-files.yml

recipes/asus/recipe-aurora-asus.yml

@@ -12,7 +12,7 @@ modules:
   - from-file: common/aurora-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml

recipes/asus/recipe-aurora-dx-asus-nvidia-userns.yml

@@ -13,7 +13,7 @@ modules:
   - from-file: common/aurora-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
   - from-file: common/kinoite-files.yml

recipes/asus/recipe-aurora-dx-asus-userns.yml

@@ -13,7 +13,7 @@ modules:
   - from-file: common/aurora-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
   - from-file: common/kinoite-files.yml

recipes/asus/recipe-kinoite-asus-nvidia-userns.yml

@@ -11,7 +11,7 @@ modules:
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/asus/recipe-kinoite-asus-nvidia.yml

@@ -11,7 +11,7 @@ modules:
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml

recipes/asus/recipe-kinoite-asus-userns.yml

@@ -13,7 +13,7 @@ modules:
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/asus/recipe-kinoite-asus.yml

@@ -13,7 +13,7 @@ modules:
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml

recipes/asus/recipe-silverblue-asus-nvidia-userns.yml

@@ -13,7 +13,7 @@ modules:
   - from-file: common/silverblue-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/asus/recipe-silverblue-asus-nvidia.yml

@@ -13,7 +13,7 @@ modules:
   - from-file: common/silverblue-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml

recipes/asus/recipe-silverblue-asus-userns.yml

@@ -15,7 +15,7 @@ modules:
   - from-file: common/silverblue-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/asus/recipe-silverblue-asus.yml

@@ -15,7 +15,7 @@ modules:
   - from-file: common/silverblue-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml

recipes/common/cosmic-scripts.yml

@@ -1,3 +0,0 @@
-type: script
-scripts:
-  - hardencosmiccontainerpolicy.sh

recipes/common/rechunked-scripts.yml

@@ -0,0 +1,4 @@
+type: script
+scripts:
+  - hardenrechunkedcontainerpolicy.sh
+  - usehardenedmalloclight.sh

recipes/general/recipe-aurora-dx-main-userns.yml

@@ -13,7 +13,7 @@ modules:
   - from-file: common/aurora-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
   - from-file: common/kinoite-files.yml

recipes/general/recipe-aurora-dx-nvidia-userns.yml

@@ -13,7 +13,7 @@ modules:
   - from-file: common/aurora-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
   - from-file: common/kinoite-files.yml

recipes/general/recipe-aurora-dx-surface-nvidia-userns.yml

@@ -13,7 +13,7 @@ modules:
   - from-file: common/aurora-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
   - from-file: common/kinoite-files.yml

recipes/general/recipe-aurora-dx-surface-userns.yml

@@ -13,7 +13,7 @@ modules:
   - from-file: common/aurora-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
   - from-file: common/kinoite-files.yml

recipes/general/recipe-aurora-main-userns.yml

@@ -12,7 +12,7 @@ modules:
   - from-file: common/aurora-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
   - from-file: common/kinoite-files.yml

recipes/general/recipe-aurora-main.yml

@@ -12,7 +12,7 @@ modules:
   - from-file: common/aurora-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml

recipes/general/recipe-aurora-nvidia-userns.yml

@@ -12,7 +12,7 @@ modules:
   - from-file: common/aurora-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
   - from-file: common/kinoite-files.yml

recipes/general/recipe-aurora-nvidia.yml

@@ -12,7 +12,7 @@ modules:
   - from-file: common/aurora-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml

recipes/general/recipe-aurora-surface-nvidia-userns.yml

@@ -12,7 +12,7 @@ modules:
   - from-file: common/aurora-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
   - from-file: common/kinoite-files.yml

recipes/general/recipe-aurora-surface-nvidia.yml

@@ -12,7 +12,7 @@ modules:
   - from-file: common/aurora-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml

recipes/general/recipe-aurora-surface-userns.yml

@@ -12,7 +12,7 @@ modules:
   - from-file: common/aurora-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
   - from-file: common/kinoite-files.yml

recipes/general/recipe-aurora-surface.yml

@@ -12,7 +12,7 @@ modules:
   - from-file: common/aurora-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml

recipes/general/recipe-bluefin-dx-main-userns.yml

@@ -14,7 +14,7 @@ modules:
   - from-file: common/bluefin-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-bluefin-dx-nvidia-userns.yml

@@ -14,7 +14,7 @@ modules:
   - from-file: common/bluefin-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-bluefin-main-userns.yml

@@ -13,7 +13,7 @@ modules:
   - from-file: common/bluefin-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-bluefin-main.yml

@@ -13,7 +13,7 @@ modules:
   - from-file: common/bluefin-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml

recipes/general/recipe-bluefin-nvidia-userns.yml

@@ -13,7 +13,7 @@ modules:
   - from-file: common/bluefin-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-bluefin-nvidia.yml

@@ -13,7 +13,7 @@ modules:
   - from-file: common/bluefin-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/bluefin-scripts.yml

recipes/general/recipe-cinnamon-main-userns.yml

@@ -10,7 +10,7 @@ modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/cinnamon-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-cinnamon-main.yml

@@ -10,7 +10,7 @@ modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/cinnamon-scripts.yml

recipes/general/recipe-cinnamon-nvidia-userns.yml

@@ -10,7 +10,7 @@ modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/cinnamon-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-cinnamon-nvidia.yml

@@ -10,7 +10,7 @@ modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/cinnamon-scripts.yml

recipes/general/recipe-cosmic-main-userns.yml

@@ -13,7 +13,7 @@ modules:
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml
   - from-file: common/common-scripts.yml
-  - from-file: common/cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - type: secureblue-signing
   - type: yafti

recipes/general/recipe-cosmic-main.yml

@@ -13,7 +13,7 @@ modules:
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml
   - from-file: common/common-scripts.yml
-  - from-file: common/cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml

recipes/general/recipe-cosmic-nvidia-userns.yml

@@ -13,7 +13,7 @@ modules:
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml
   - from-file: common/common-scripts.yml
-  - from-file: common/cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - type: secureblue-signing
   - type: yafti

recipes/general/recipe-cosmic-nvidia.yml

@@ -13,7 +13,7 @@ modules:
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml
   - from-file: common/common-scripts.yml
-  - from-file: common/cosmic-scripts.yml
+  - from-file: common/rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/disableuserns-scripts.yml

recipes/general/recipe-kinoite-main-userns.yml

@@ -11,7 +11,7 @@ modules:
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-kinoite-main.yml

@@ -11,7 +11,7 @@ modules:
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml

recipes/general/recipe-kinoite-nvidia-userns.yml

@@ -11,7 +11,7 @@ modules:
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-kinoite-nvidia.yml

@@ -11,7 +11,7 @@ modules:
   - from-file: common/kinoite-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml

recipes/general/recipe-sericea-main-userns.yml

@@ -10,7 +10,7 @@ modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-sericea-main.yml

@@ -10,7 +10,7 @@ modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml

recipes/general/recipe-sericea-nvidia-userns.yml

@@ -10,7 +10,7 @@ modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-sericea-nvidia.yml

@@ -10,7 +10,7 @@ modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml

recipes/general/recipe-silverblue-main-userns.yml

@@ -15,7 +15,7 @@ modules:
   - from-file: common/silverblue-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-silverblue-main.yml

@@ -16,7 +16,7 @@ modules:
   - from-file: common/gui-packages.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-silverblue-nvidia-userns.yml

@@ -13,7 +13,7 @@ modules:
   - from-file: common/silverblue-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-silverblue-nvidia.yml

@@ -14,7 +14,7 @@ modules:
   - from-file: common/gui-packages.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-wayblue-hyprland-main-userns.yml

@@ -10,7 +10,7 @@ modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-wayblue-hyprland-main.yml

@@ -11,7 +11,7 @@ modules:
   - from-file: common/disableuserns-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-wayblue-hyprland-nvidia-userns.yml

@@ -10,7 +10,7 @@ modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-wayblue-hyprland-nvidia.yml

@@ -10,7 +10,7 @@ modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml

recipes/general/recipe-wayblue-river-main-userns.yml

@@ -10,7 +10,7 @@ modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-wayblue-river-main.yml

@@ -10,7 +10,7 @@ modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml

recipes/general/recipe-wayblue-river-nvidia-userns.yml

@@ -10,7 +10,7 @@ modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-wayblue-river-nvidia.yml

@@ -11,7 +11,7 @@ modules:
   - from-file: common/gui-packages.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-wayblue-sway-main-userns.yml

@@ -10,7 +10,7 @@ modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-wayblue-sway-main.yml

@@ -10,7 +10,7 @@ modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml

recipes/general/recipe-wayblue-sway-nvidia-userns.yml

@@ -10,7 +10,7 @@ modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-wayblue-sway-nvidia.yml

@@ -11,7 +11,7 @@ modules:
   - from-file: common/gui-packages.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/common-files.yml

recipes/general/recipe-wayblue-wayfire-main-userns.yml

@@ -10,7 +10,7 @@ modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/wayfire-scripts.yml

recipes/general/recipe-wayblue-wayfire-main.yml

@@ -10,7 +10,7 @@ modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/disableuserns-packages.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml

recipes/general/recipe-wayblue-wayfire-nvidia-userns.yml

@@ -10,7 +10,7 @@ modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/wayfire-scripts.yml

recipes/general/recipe-wayblue-wayfire-nvidia.yml

@@ -11,7 +11,7 @@ modules:
   - from-file: common/disableuserns-packages.yml
   - from-file: common/gui-packages.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/remove-firefox.yml
   - from-file: common/gui-scripts.yml
   - from-file: common/wayfire-scripts.yml

recipes/securecore/recipe-securecore-main-userns.yml

@@ -9,7 +9,7 @@ image-version: testing
 modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/server-packages.yml
   - from-file: common/common-files.yml
   - from-file: common/server-files.yml

recipes/securecore/recipe-securecore-main.yml

@@ -9,7 +9,7 @@ image-version: testing
 modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/server-packages.yml
   - from-file: common/common-files.yml  
   - from-file: common/server-files.yml

recipes/securecore/recipe-securecore-nvidia-userns.yml

@@ -9,7 +9,7 @@ image-version: testing-nvidia
 modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/server-packages.yml
   - from-file: common/common-files.yml
   - from-file: common/server-files.yml

recipes/securecore/recipe-securecore-nvidia.yml

@@ -9,7 +9,7 @@ image-version: testing-nvidia
 modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/server-packages.yml
   - from-file: common/common-files.yml
   - from-file: common/server-files.yml

recipes/securecore/recipe-securecore-zfs-main-userns.yml

@@ -9,7 +9,7 @@ image-version: testing-zfs
 modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/server-packages.yml
   - from-file: common/common-files.yml
   - from-file: common/server-files.yml

recipes/securecore/recipe-securecore-zfs-main.yml

@@ -9,7 +9,7 @@ image-version: testing-zfs
 modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/server-packages.yml
   - from-file: common/common-files.yml  
   - from-file: common/server-files.yml

recipes/securecore/recipe-securecore-zfs-nvidia-userns.yml

@@ -9,7 +9,7 @@ image-version: testing-nvidia-zfs
 modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/server-packages.yml
   - from-file: common/common-files.yml
   - from-file: common/server-files.yml

recipes/securecore/recipe-securecore-zfs-nvidia.yml

@@ -9,7 +9,7 @@ image-version: testing-nvidia-zfs
 modules:
   - from-file: common/initialization-scripts.yml
   - from-file: common/common-packages.yml 
-  - from-file: common/non-cosmic-scripts.yml
+  - from-file: common/non-rechunked-scripts.yml
   - from-file: common/server-packages.yml
   - from-file: common/common-files.yml
   - from-file: common/server-files.yml