From 8dadc4cc2448afbdf4dab732c4adafb2e607f5ed Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sun, 17 Nov 2024 21:21:58 -0800 Subject: [PATCH] chore: Only enable sddm-fix on KDE images, disable on deck --- Containerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index c5315f9609..04eb07e373 100644 --- a/Containerfile +++ b/Containerfile @@ -706,6 +706,7 @@ RUN rm -f /etc/profile.d/toolbox.sh && \ echo "import \"/usr/share/ublue-os/just/86-bazzite-windows.just\"" >> /usr/share/ublue-os/justfile && \ echo "import \"/usr/share/ublue-os/just/90-bazzite-de.just\"" >> /usr/share/ublue-os/justfile && \ if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \ + systemctl enable usr-share-sddm-themes.mount && \ mkdir -p "/usr/share/ublue-os/dconfs/desktop-kinoite/" && \ cp "/usr/share/glib-2.0/schemas/zz0-"*"-bazzite-desktop-kinoite-"*".gschema.override" "/usr/share/ublue-os/dconfs/desktop-kinoite/" && \ find "/etc/dconf/db/distro.d/" -maxdepth 1 -type f -exec cp {} "/usr/share/ublue-os/dconfs/desktop-kinoite/" \; && \ @@ -764,7 +765,6 @@ RUN rm -f /etc/profile.d/toolbox.sh && \ systemctl enable ublue-update.timer && \ systemctl enable incus-workaround.service && \ systemctl enable bazzite-hardware-setup.service && \ - systemctl enable usr-share-sddm-themes.mount && \ systemctl disable tailscaled.service && \ systemctl enable dev-hugepages1G.mount && \ systemctl enable bazzite-snapper-setup && \ @@ -917,6 +917,8 @@ RUN /usr/libexec/containerbuild/image-info && \ find "/etc/dconf/db/distro.d/" -maxdepth 1 -type f -exec cp {} "/usr/share/ublue-os/dconfs/deck-silverblue/" \; && \ dconf-override-converter to-dconf "/usr/share/ublue-os/dconfs/deck-silverblue/zz0-"*"-bazzite-deck-silverblue-"*".gschema.override" && \ rm "/usr/share/ublue-os/dconfs/deck-silverblue/zz0-"*"-bazzite-deck-silverblue-"*".gschema.override" \ + ; else \ + systemctl disable usr-share-sddm-themes.mount \ ; fi && \ mkdir -p /tmp/bazzite-schema-test && \ find "/usr/share/glib-2.0/schemas/" -type f ! -name "*.gschema.override" -exec cp {} "/tmp/bazzite-schema-test/" \; && \