fix(Aurora): Restore x11 for 40

build_files/base/aurora-changes.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-set -oue pipefail
+set -ouex pipefail
 
 if [[ "${BASE_IMAGE_NAME}" = "kinoite" ]]; then
     ln -sf ../places/distributor-logo.svg /usr/share/icons/hicolor/scalable/apps/start-here.svg

build_files/base/branding.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/bash
 
-set -oue pipefail
-
+set -ouex pipefail
 
 # Branding for Bluefin/Aurora
 if test "$BASE_IMAGE_NAME" = "silverblue"; then

build_files/base/build-base.sh

@@ -1,17 +1,16 @@
 #!/usr/bin/bash
 # shellcheck disable=SC1091
 
-set -oue pipefail
+set -ouex pipefail
 
 . /tmp/build/copr-repos.sh
-. /tmp/build/nvidia-explicit-sync.sh
 . /tmp/build/install-akmods.sh
 . /tmp/build/packages.sh
-. /tmp/build/fetch-install.sh
+. /tmp/build/nvidia.sh
 . /tmp/build/image-info.sh
+. /tmp/build/fetch-install.sh
 . /tmp/build/fetch-quadlets.sh
 . /tmp/build/font-install.sh
-. /tmp/build/install-tmp.sh
 . /tmp/build/systemd.sh
 . /tmp/build/bluefin-changes.sh
 . /tmp/build/aurora-changes.sh

build_files/base/copr-repos.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-set -oue pipefail
+set -ouex pipefail
 
 # Add Staging repo
 wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo

build_files/base/fetch-install.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-set -oue pipefail
+set -ouex pipefail
 
 # Starship Shell Prompt
 curl -Lo /tmp/starship.tar.gz "https://github.com/starship/starship/releases/latest/download/starship-x86_64-unknown-linux-gnu.tar.gz"
@@ -21,4 +21,10 @@ wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /usr/etc/flatpak/remo
 pip install --prefix=/usr topgrade
 
 # Install ublue-update -- breaks with packages.json
-rpm-ostree install ublue-update
+rpm-ostree install ublue-update
+
+# Consolidate Just Files
+find /tmp/just -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; >> /usr/share/ublue-os/just/60-custom.just
+
+# Copy over ublue-update config
+cp /tmp/ublue-update.toml /usr/etc/ublue-update/ublue-update.toml

build_files/base/fetch-quadlets.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -oue pipefail
+set -ouex pipefail
 
 # Make Directory
 mkdir -p /usr/etc/containers/systemd/users

build_files/base/install-akmods.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -oue pipefail
+set -ouex pipefail
 
 sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
 wget https://negativo17.org/repos/fedora-multimedia.repo -O /etc/yum.repos.d/negativo17-fedora-multimedia.repo

build_files/base/nvidia.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/bash
+
+set -ouex pipefail
+
+# Nvidia Configurations
+if [[ "${IMAGE_FLAVOR}" =~ "nvidia" ]]; then
+    # Restore x11 for Nvidia Images
+    if [[ "${BASE_IMAGE_NAME}" =~ "kinoite" && "${FEDORA_MAJOR_VERSION}" -gt "39" ]]; then
+        rpm-ostree install plasma-workspace-x11
+    fi
+fi

build_files/dx/branding-dx.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-set -oue pipefail
+set -ouex pipefail
 
 if test "$BASE_IMAGE_NAME" = "silverblue"; then
     sed -i '/^PRETTY_NAME/s/Bluefin/Bluefin-dx/' /usr/lib/os-release

build_files/dx/build-dx.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/bash
 # shellcheck disable=SC1091
 
-set -oue pipefail
+set -ouex pipefail
 
 # Apply IP Forwarding before installing Docker to prevent messing with LXC networking
 sysctl -p

build_files/dx/copr-repos-dx.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-set -oue pipefail
+set -ouex pipefail
 
 #incus, lxc, lxd
 wget https://copr.fedorainfracloud.org/coprs/ganto/lxc4/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo

build_files/dx/fetch-install-dx.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-set -oue pipefail
+set -ouex pipefail
 
 curl -Lo ./kind "https://github.com/kubernetes-sigs/kind/releases/latest/download/kind-$(uname)-amd64"
 chmod +x ./kind

build_files/dx/systemd-dx.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-set -oue pipefail
+set -ouex pipefail
 
 systemctl enable docker.socket
 systemctl enable podman.socket

build_files/shared/image-info.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
-set -oue pipefail
+set -ouex pipefail
 
 IMAGE_INFO="/usr/share/ublue-os/image-info.json"
 IMAGE_REF="ostree-image-signed:docker://ghcr.io/$IMAGE_VENDOR/$IMAGE_NAME"
 
 case $FEDORA_MAJOR_VERSION in
-  38)
+  39)
     IMAGE_TAG="gts"
     ;;
   *)