Skip to content

Commit

Permalink
chore: Only enable sddm-fix on KDE images, disable on deck
Browse files Browse the repository at this point in the history
  • Loading branch information
KyleGospo committed Nov 18, 2024
1 parent 6bc975a commit 779c020
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,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/" \; && \
Expand Down Expand Up @@ -757,7 +758,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 && \
Expand Down Expand Up @@ -910,6 +910,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/" \; && \
Expand Down

0 comments on commit 779c020

Please sign in to comment.