From 2d100dcbdfe10c66632c61a18c5ba682eb3fb219 Mon Sep 17 00:00:00 2001 From: Caleb Connolly Date: Mon, 20 Feb 2023 23:51:22 +0000 Subject: [PATCH] Revert "postmarketos-ui-xfce: switch to tinydm (MR 3887)" (MR 3893) This reverts commit 5915d1630b0b85e6ac657b4bbfdb1a9dc1031d51. --- main/postmarketos-ui-xfce4/64-lightdm-autologin.conf | 5 +++++ main/postmarketos-ui-xfce4/APKBUILD | 10 ++++++++-- .../postmarketos-ui-xfce4.post-install | 11 +++++++---- 3 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 main/postmarketos-ui-xfce4/64-lightdm-autologin.conf diff --git a/main/postmarketos-ui-xfce4/64-lightdm-autologin.conf b/main/postmarketos-ui-xfce4/64-lightdm-autologin.conf new file mode 100644 index 000000000..05f9b2936 --- /dev/null +++ b/main/postmarketos-ui-xfce4/64-lightdm-autologin.conf @@ -0,0 +1,5 @@ +# This file gets removed with postmarketos-ui-xfce4, even if modified! +[Seat:*] +autologin-user=username +autologin-user-timeout=0 +autologin-session=xfce diff --git a/main/postmarketos-ui-xfce4/APKBUILD b/main/postmarketos-ui-xfce4/APKBUILD index 629f794aa..94bdacea2 100644 --- a/main/postmarketos-ui-xfce4/APKBUILD +++ b/main/postmarketos-ui-xfce4/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakko pkgname=postmarketos-ui-xfce4 pkgver=0.5.1 -pkgrel=10 +pkgrel=11 pkgdesc="(X11) Lightweight desktop (stylus recommended)" url="https://gitlab.com/postmarketOS/xfce4-phone" arch="noarch" @@ -11,11 +11,12 @@ depends=" bluez dnsmasq elogind + lightdm + lightdm-openrc mesa-egl polkit-elogind postmarketos-base-ui postmarketos-base-ui-networkmanager - tinydm xfce4 xorg-server " @@ -42,6 +43,7 @@ install="$pkgname.post-install $pkgname.post-upgrade" source=" xfce4-phone-$pkgver.tar.gz::https://gitlab.com/postmarketOS/xfce4-phone/-/archive/$pkgver/xfce4-phone-$pkgver.tar.gz 10_onboard.gschema.override + 64-lightdm-autologin.conf enable-scrollbars.sh onboard-autostart.desktop unclutter-xfixes.desktop @@ -60,6 +62,9 @@ package() { install -Dm644 "$srcdir"/10_onboard.gschema.override \ "$pkgdir"/usr/share/glib-2.0/schemas/10_onboard.gschema.override + install -Dm644 "$srcdir"/64-lightdm-autologin.conf \ + "$pkgdir"/usr/share/lightdm/lightdm.conf.d/64-autologin.conf + install -Dm644 "$srcdir"/enable-scrollbars.sh \ "$pkgdir"/etc/profile.d/enable-scrollbars.sh @@ -76,6 +81,7 @@ package() { sha512sums=" 1dd80635d726bac3e0436a7e5f407204d1768ab69a515a42b1affc852ec3dd7780529230c7f7f6626e58c0337c22a14895f6598c69918ef2c31b0eec4353838f xfce4-phone-0.5.1.tar.gz ffcc518ff58d37de302bd101e57bf983800e45899645d476045d0a74096704333a0b513f45e6a5485fdbd80ac1caebce14a760cab6fcc6d5dde0d766ade8b58b 10_onboard.gschema.override +3841294daffdd3e0da5a7ba155ba8c21e9e5a2f2ba5b3b5ffa3ea6a16486625d3655d03f8c18740fcddfbca673c42a5289ec3b22720cfbbdd56fde8fdc3bf9b0 64-lightdm-autologin.conf 262cdcf334cfa56872797c960cb8683b79c7b13b0a8179cd002e598576f0e9fe07057fd0fe724e87a6664db4b91b31a8c0cbf026ab137533b07675f838ae57bb enable-scrollbars.sh ce7921f500b603796572bc02fa123e58d58ed1e9efd4d909de8f73c11a3e0bc0893639ce159f0701578b19db764893d021502d1c98cc24eb692e9d48320ff68c onboard-autostart.desktop b626c8b27d9418df15124d6e97f5174c173863536e9c3eebfb11473d764c81e1db40cf4b7cdabe44b67a0e295d920c7a849a3e2e40dd86402de8200242c7b05a unclutter-xfixes.desktop diff --git a/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-install b/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-install index b958f9925..11e6755e4 100644 --- a/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-install +++ b/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-install @@ -1,7 +1,10 @@ #!/bin/sh -rc-update add bluetooth default -rc-update add networkmanager default -rc-update add tinydm default +sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/64-autologin.conf -tinydm-set-session -s /usr/share/xsessions/xfce.desktop +rc-update add bluetooth default +rc-update add lightdm default +rc-update add networkmanager default + +# Needed to fully revert pma!3887 +rc-update -q del tinydm default