From c579b499c7de8cfd878520b54ac8898ad5cd608f Mon Sep 17 00:00:00 2001
From: Jiri Konecny <jkonecny@redhat.com>
Date: Mar 12 2025 14:38:03 +0000
Subject: Enable locale1-x11-sync script for X11 spins


This script will reflect keyboard layout configuration between
localed DBus service and the running X11 based environment.

This is requirement for Anaconda to be able to control keyboard layouts
in the Live environment. Requirement was implemented by
https://fedoraproject.org/wiki/Changes/Anaconda_As_Native_Wayland_Application#Consistent_keyboard_control

---

diff --git a/libexec/livesys/sessions.d/livesys-budgie b/libexec/livesys/sessions.d/livesys-budgie
index 1870be8..c37ec31 100755
--- a/libexec/livesys/sessions.d/livesys-budgie
+++ b/libexec/livesys/sessions.d/livesys-budgie
@@ -54,3 +54,7 @@ glib-compile-schemas /usr/share/glib-2.0/schemas
 if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
   sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
 fi
+
+# enable localed support for the live desktop so Anaconda is able to control keyboard layout
+# https://fedoraproject.org/wiki/Changes/Anaconda_As_Native_Wayland_Application#Consistent_keyboard_control
+sudo -u liveuser systemctl --user start locale1-x11-sync.service
diff --git a/libexec/livesys/sessions.d/livesys-cinnamon b/libexec/livesys/sessions.d/livesys-cinnamon
index df52297..3960545 100755
--- a/libexec/livesys/sessions.d/livesys-cinnamon
+++ b/libexec/livesys/sessions.d/livesys-cinnamon
@@ -23,3 +23,7 @@ cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
 
 # and mark it as executable
 chmod +x /home/liveuser/Desktop/liveinst.desktop
+
+# enable localed support for the live desktop so Anaconda is able to control keyboard layout
+# https://fedoraproject.org/wiki/Changes/Anaconda_As_Native_Wayland_Application#Consistent_keyboard_control
+sudo -u liveuser systemctl --user start locale1-x11-sync.service
diff --git a/libexec/livesys/sessions.d/livesys-i3 b/libexec/livesys/sessions.d/livesys-i3
index 39d63b1..e06e175 100755
--- a/libexec/livesys/sessions.d/livesys-i3
+++ b/libexec/livesys/sessions.d/livesys-i3
@@ -28,3 +28,7 @@ echo "echo 'Please type liveinst and press Enter to start the installer'" >> /ho
 
 # fixing the installer non opening bug
 echo "xhost si:localuser:root" >> /home/liveuser/.profile
+
+# enable localed support for the live desktop so Anaconda is able to control keyboard layout
+# https://fedoraproject.org/wiki/Changes/Anaconda_As_Native_Wayland_Application#Consistent_keyboard_control
+sudo -u liveuser systemctl --user start locale1-x11-sync.service
diff --git a/libexec/livesys/sessions.d/livesys-lxde b/libexec/livesys/sessions.d/livesys-lxde
index 9236f15..23c625f 100755
--- a/libexec/livesys/sessions.d/livesys-lxde
+++ b/libexec/livesys/sessions.d/livesys-lxde
@@ -38,3 +38,7 @@ save_history=false
 statics_show=true
 single_line=true
 FOE
+
+# enable localed support for the live desktop so Anaconda is able to control keyboard layout
+# https://fedoraproject.org/wiki/Changes/Anaconda_As_Native_Wayland_Application#Consistent_keyboard_control
+sudo -u liveuser systemctl --user start locale1-x11-sync.service
diff --git a/libexec/livesys/sessions.d/livesys-mate b/libexec/livesys/sessions.d/livesys-mate
index ed62e8d..42d6d75 100755
--- a/libexec/livesys/sessions.d/livesys-mate
+++ b/libexec/livesys/sessions.d/livesys-mate
@@ -34,3 +34,7 @@ fi
 
 # no updater applet in live environment
 rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
+
+# enable localed support for the live desktop so Anaconda is able to control keyboard layout
+# https://fedoraproject.org/wiki/Changes/Anaconda_As_Native_Wayland_Application#Consistent_keyboard_control
+sudo -u liveuser systemctl --user start locale1-x11-sync.service
diff --git a/libexec/livesys/sessions.d/livesys-xfce b/libexec/livesys/sessions.d/livesys-xfce
index 9269513..b947ae1 100755
--- a/libexec/livesys/sessions.d/livesys-xfce
+++ b/libexec/livesys/sessions.d/livesys-xfce
@@ -49,3 +49,7 @@ chmod +x /home/liveuser/Desktop/liveinst.desktop
 # set xfce-exe-checksum metadata to make the harddisk installer desktop icon trusted (#2172854)
 LIVEINST_DESKTOP_CHECKSUM="$(sha256sum /home/liveuser/Desktop/liveinst.desktop | awk '{print $1}')"
 sudo -u liveuser dbus-launch gio set -t string /home/liveuser/Desktop/liveinst.desktop metadata::xfce-exe-checksum ${LIVEINST_DESKTOP_CHECKSUM}
+
+# enable localed support for the live desktop so Anaconda is able to control keyboard layout
+# https://fedoraproject.org/wiki/Changes/Anaconda_As_Native_Wayland_Application#Consistent_keyboard_control
+sudo -u liveuser systemctl --user start locale1-x11-sync.service