From e86342b764d99f217f4c75c84fda34ca50f7e4b1 Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Sun, 22 Oct 2023 23:20:13 +0700 Subject: [PATCH] Revert "add back the hacks" This reverts commit 5468b2998059b59ce9028666f0cc533ded542ee3. --- katsu/modules/flagship/flagship-live.sh | 5 +++-- katsu/modules/gnome/gnome-live.sh | 2 -- katsu/modules/live/live.sh | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/katsu/modules/flagship/flagship-live.sh b/katsu/modules/flagship/flagship-live.sh index 5d5e2b9..f3a0b51 100644 --- a/katsu/modules/flagship/flagship-live.sh +++ b/katsu/modules/flagship/flagship-live.sh @@ -43,7 +43,8 @@ EOF cp /etc/lightdm/lightdm.conf.d/50-ultramarine-lightdm-gtk-greeter.conf /etc/lightdm/lightdm-gtk-greeter.conf -# Reinstall gnome-user-doc +# Reinstall anaconda-core and anaconda-live to make sure we fix any localization issues + +# dnf reinstall -y anaconda-core -dnf reinstall -y gnome-user-docs || true && dnf clean all dnf clean all diff --git a/katsu/modules/gnome/gnome-live.sh b/katsu/modules/gnome/gnome-live.sh index ed70550..92bdd4f 100644 --- a/katsu/modules/gnome/gnome-live.sh +++ b/katsu/modules/gnome/gnome-live.sh @@ -4,5 +4,3 @@ sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys sed -i 's/Fedora/Ultramarine/g' /usr/share/anaconda/gnome/fedora-welcome sed -i 's/Fedora/Ultramarine/g' /usr/share/applications/org.fedoraproject.welcome-screen.desktop sed -i 's/Fedora/Ultramarine/g' /usr/share/anaconda/gnome/org.fedoraproject.welcome-screen.desktop - -dnf reinstall -y gnome-user-docs || true && dnf clean all \ No newline at end of file diff --git a/katsu/modules/live/live.sh b/katsu/modules/live/live.sh index 5420868..13db629 100644 --- a/katsu/modules/live/live.sh +++ b/katsu/modules/live/live.sh @@ -63,7 +63,7 @@ systemctl set-default graphical.target # it actually cannot reinstall it, but this somehow fixes the issue # I assume scuffed rpm db or something # If anyone manages to figure out why this works, please let me know - @korewachino -dnf reinstall - anaconda-core || true && dnf clean all +# dnf reinstall - anaconda-core || true && dnf clean all cat >> /var/lib/livesys/livesys-session-extra << EOF