From 5b1a20fbafa5ba16098805a1a9e538ed70f470bf Mon Sep 17 00:00:00 2001 From: Asriel Dreemurr Date: Mon, 27 May 2019 13:30:15 +0700 Subject: [PATCH] main/postmarketos-ui-*: fix lightdm autologin after reinstall (!385) When the UI package is reinstalled (due to the package being recompiled or upgraded), it runs $pkgname.post-upgrade instead of $pkgname.post-install which would run the sed replacement LightDM autologin. This will cause LightDM to show the greeter when the UI package is rebuilt, and the user ran pmbootstrap install without deleting the old chroot. Signed-off-by: Asriel Dreemurr Reviewed-by: Danct12 Signed-off-by: Danct12 --- main/postmarketos-ui-hildon/APKBUILD | 4 ++-- .../postmarketos-ui-hildon.post-upgrade | 5 +++++ main/postmarketos-ui-i3wm/APKBUILD | 4 ++-- main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-upgrade | 4 ++++ main/postmarketos-ui-matchbox/APKBUILD | 4 ++-- .../postmarketos-ui-matchbox.post-upgrade | 5 +++++ main/postmarketos-ui-mate/APKBUILD | 4 ++-- main/postmarketos-ui-mate/postmarketos-ui-mate.post-upgrade | 5 +++++ main/postmarketos-ui-xfce4/APKBUILD | 4 ++-- .../postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-upgrade | 5 +++++ 10 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 main/postmarketos-ui-hildon/postmarketos-ui-hildon.post-upgrade create mode 100644 main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-upgrade create mode 100644 main/postmarketos-ui-matchbox/postmarketos-ui-matchbox.post-upgrade create mode 100644 main/postmarketos-ui-mate/postmarketos-ui-mate.post-upgrade create mode 100644 main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-upgrade diff --git a/main/postmarketos-ui-hildon/APKBUILD b/main/postmarketos-ui-hildon/APKBUILD index e09259ca5..5c5f358b1 100644 --- a/main/postmarketos-ui-hildon/APKBUILD +++ b/main/postmarketos-ui-hildon/APKBUILD @@ -1,12 +1,12 @@ pkgname=postmarketos-ui-hildon pkgver=1 -pkgrel=6 +pkgrel=7 pkgdesc="(X11) Lightweight GTK+2 UI (optimized for single-touch touchscreens)" url="https://postmarketos.org" arch="noarch" license="GPL3+" depends="dbus-x11 gtk+2.0-maemo hildon-desktop hildon-theme-alpha mesa xorg-server lightdm" -install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall" +install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall $pkgname.post-upgrade" source="60-lightdm-autologin.conf hildon.desktop xinitrc_hildon.sh" options="!check" diff --git a/main/postmarketos-ui-hildon/postmarketos-ui-hildon.post-upgrade b/main/postmarketos-ui-hildon/postmarketos-ui-hildon.post-upgrade new file mode 100644 index 000000000..a7791b1e4 --- /dev/null +++ b/main/postmarketos-ui-hildon/postmarketos-ui-hildon.post-upgrade @@ -0,0 +1,5 @@ +#!/bin/sh + +sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/60-autologin.conf + +rc-update add lightdm default diff --git a/main/postmarketos-ui-i3wm/APKBUILD b/main/postmarketos-ui-i3wm/APKBUILD index d866d7d8d..cb9179b97 100644 --- a/main/postmarketos-ui-i3wm/APKBUILD +++ b/main/postmarketos-ui-i3wm/APKBUILD @@ -1,12 +1,12 @@ pkgname=postmarketos-ui-i3wm pkgver=0.3 -pkgrel=1 +pkgrel=2 pkgdesc="(X11) Tiling WM (keyboard required)" url="https://i3wm.org" arch="noarch" license="GPL-3.0" depends="xorg-server mesa-egl i3wm i3status dmenu xset xinput st lightdm" -install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall" +install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall $pkgname.post-upgrade" source="lock.sh 60-lightdm-autologin.conf" options="!check" diff --git a/main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-upgrade b/main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-upgrade new file mode 100644 index 000000000..35c8343f2 --- /dev/null +++ b/main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-upgrade @@ -0,0 +1,4 @@ +#!/bin/sh + +sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/60-autologin.conf +rc-update add lightdm default diff --git a/main/postmarketos-ui-matchbox/APKBUILD b/main/postmarketos-ui-matchbox/APKBUILD index 5564ee9f4..ae395788d 100644 --- a/main/postmarketos-ui-matchbox/APKBUILD +++ b/main/postmarketos-ui-matchbox/APKBUILD @@ -1,12 +1,12 @@ pkgname=postmarketos-ui-matchbox pkgver=1 -pkgrel=3 +pkgrel=4 pkgdesc="(X11) Very basic user interface for handhelds" url="https://matchbox-project.org" arch="noarch" license="GPL-2.0-only" depends="matchbox-common matchbox-panel matchbox-desktop matchbox-keyboard matchbox-window-manager xterm xorg-server dbus-x11 mesa-egl gtk+2.0 lightdm" -install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall" +install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall $pkgname.post-upgrade" source="matchbox.desktop 60-lightdm-autologin.conf" options="!check" diff --git a/main/postmarketos-ui-matchbox/postmarketos-ui-matchbox.post-upgrade b/main/postmarketos-ui-matchbox/postmarketos-ui-matchbox.post-upgrade new file mode 100644 index 000000000..a7791b1e4 --- /dev/null +++ b/main/postmarketos-ui-matchbox/postmarketos-ui-matchbox.post-upgrade @@ -0,0 +1,5 @@ +#!/bin/sh + +sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/60-autologin.conf + +rc-update add lightdm default diff --git a/main/postmarketos-ui-mate/APKBUILD b/main/postmarketos-ui-mate/APKBUILD index fb6b8b8cd..d2979551b 100644 --- a/main/postmarketos-ui-mate/APKBUILD +++ b/main/postmarketos-ui-mate/APKBUILD @@ -1,12 +1,12 @@ pkgname=postmarketos-ui-mate pkgver=1 -pkgrel=5 +pkgrel=6 pkgdesc="(X11) MATE Desktop Environment, fork of GNOME2 (stylus recommended)" url="http://mate-desktop.org/" arch="noarch" license="GPL3+" depends="mate-desktop-environment xorg-server dbus-x11 mesa-egl postmarketos-artwork-wallpapers gtk+2.0 lightdm" -install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall" +install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall $pkgname.post-upgrade" subpackages="" source="000-system-background.gschema.override 60-lightdm-autologin.conf" options="!check" diff --git a/main/postmarketos-ui-mate/postmarketos-ui-mate.post-upgrade b/main/postmarketos-ui-mate/postmarketos-ui-mate.post-upgrade new file mode 100644 index 000000000..a7791b1e4 --- /dev/null +++ b/main/postmarketos-ui-mate/postmarketos-ui-mate.post-upgrade @@ -0,0 +1,5 @@ +#!/bin/sh + +sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/60-autologin.conf + +rc-update add lightdm default diff --git a/main/postmarketos-ui-xfce4/APKBUILD b/main/postmarketos-ui-xfce4/APKBUILD index 1891f0930..d0a2ac98d 100644 --- a/main/postmarketos-ui-xfce4/APKBUILD +++ b/main/postmarketos-ui-xfce4/APKBUILD @@ -1,12 +1,12 @@ pkgname=postmarketos-ui-xfce4 pkgver=0.2 -pkgrel=6 +pkgrel=7 pkgdesc="(X11) Lightweight GTK+2 desktop (stylus recommended)" url="https://gitlab.com/postmarketOS/xfce4-phone" arch="noarch" license="GPL-3.0+" depends="xfce4 xorg-server mesa-egl postmarketos-artwork-wallpapers faenza-icon-theme xfce4-battery-plugin network-manager-applet gnome-keyring lxpolkit gtk+2.0 lightdm" -install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall" +install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall $pkgname.post-upgrade" source="$pkgname-$pkgver.tar.gz::https://gitlab.com/postmarketOS/xfce4-phone/-/archive/$pkgver/xfce4-phone-$pkgver.tar.gz 60-lightdm-autologin.conf" options="!check" diff --git a/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-upgrade b/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-upgrade new file mode 100644 index 000000000..a7791b1e4 --- /dev/null +++ b/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-upgrade @@ -0,0 +1,5 @@ +#!/bin/sh + +sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/60-autologin.conf + +rc-update add lightdm default