brain-hackers_pepepper-mirror/brain-config
1
0
Fork 0
mirror of https://github.com/brain-hackers/brain-config.git synced 2025-02-01 16:20:08 +09:00
Code Issues Projects Releases Wiki Activity

Make Wayland switching more robust

Browse Source
This commit is contained in:
Simon Long 2022-05-09 11:08:44 +01:00
parent 2ef9a3a194
commit 0319d1c799
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
raspi-config (20220506) bullseye; urgency=medium
* Modify Wayland switching to work with AccountSettings
-- Simon Long <simon@raspberrypi.com> Fri, 06 May 2022 14:07:57 +0100
raspi-config (20220425) bullseye; urgency=medium raspi-config (20220425) bullseye; urgency=medium
* Tidy hardware detection functions * Tidy hardware detection functions

14
raspi-config
View File

@ -2035,7 +2035,7 @@ do_glamor() {
do_wayland() { do_wayland() {
DEFAULT=--defaultno DEFAULT=--defaultno
CURRENT=0 CURRENT=0
if grep -q "^user-session=LXDE-pi" /etc/lightdm/lightdm.conf ; then if grep -q "^user-session=LXDE-pi-wayland" /etc/lightdm/lightdm.conf ; then
DEFAULT= DEFAULT=
CURRENT=1 CURRENT=1
fi fi
@ -2049,10 +2049,18 @@ do_wayland() {
ASK_TO_REBOOT=1 ASK_TO_REBOOT=1
fi fi
if [ $RET -eq 0 ]; then if [ $RET -eq 0 ]; then
sed /etc/lightdm/lightdm.conf -i -e "s/^#\\?user-session.*/user-session=LXDE-pi/" sed /etc/lightdm/lightdm.conf -i -e "s/^#\\?user-session.*/user-session=LXDE-pi-wayland/"
sed /etc/lightdm/lightdm.conf -i -e "s/^#\\?autologin-session.*/autologin-session=LXDE-pi-wayland/"
if [ -e "/var/lib/AccountsService/users/$USER" ] ; then
sed "/var/lib/AccountsService/users/$USER" -i -e "s/XSession=.*/XSession=LXDE-pi-wayland/"
fi
STATUS=enabled STATUS=enabled
elif [ $RET -eq 1 ]; then elif [ $RET -eq 1 ]; then
sed /etc/lightdm/lightdm.conf -i -e "s/user-session.*/#user-session=LXDE-pi/" sed /etc/lightdm/lightdm.conf -i -e "s/^#\\?user-session.*/user-session=LXDE-pi-x/"
sed /etc/lightdm/lightdm.conf -i -e "s/^#\\?autologin-session.*/autologin-session=LXDE-pi-x/"
if [ -e "/var/lib/AccountsService/users/$USER" ] ; then
sed "/var/lib/AccountsService/users/$USER" -i -e "s/XSession=.*/XSession=LXDE-pi-x/"
fi
STATUS=disabled STATUS=disabled
else else
return $RET return $RET