From af86d611c5d338409e21581b54cb529c5a775bb8 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Fri, 31 May 2013 13:53:25 -0400 Subject: [PATCH 1/4] Add default lightdm setup and make sure that system user is not shown by bumping system UID_MIN --- live-build/ubuntu-touch/hooks/01-setup_user.chroot | 3 +++ .../ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf diff --git a/live-build/ubuntu-touch/hooks/01-setup_user.chroot b/live-build/ubuntu-touch/hooks/01-setup_user.chroot index dbf56e95..4541b6e4 100755 --- a/live-build/ubuntu-touch/hooks/01-setup_user.chroot +++ b/live-build/ubuntu-touch/hooks/01-setup_user.chroot @@ -11,6 +11,9 @@ echo "$USER:$USER" | chpasswd adduser --gecos system --no-create-home --disabled-login --disabled-password system --uid 1000 +# Prevent the system user from being presented in the greeter by bumping MIN_UID +sed -i 's/^\(UID_MIN\s\+\).*/\11001/g' /etc/login.defs + mkdir -p /home/$USER/Music mkdir -p /home/$USER/Pictures mkdir -p /home/$USER/Videos diff --git a/live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf b/live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf new file mode 100644 index 00000000..962900ed --- /dev/null +++ b/live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf @@ -0,0 +1,5 @@ +[SeatDefaults] +user-session=ubuntu-touch +greeter-session=qml-phone-greeter +autologin-user=phablet +autologin-in-background=true From a72a91167a340c9dd9ec583d5de0234372331bac Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Mon, 15 Jul 2013 22:16:05 -0400 Subject: [PATCH 2/4] use unity8-greeter instead of qml-phone-greeter --- .../ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf b/live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf index 962900ed..e23200a8 100644 --- a/live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf +++ b/live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf @@ -1,5 +1,5 @@ [SeatDefaults] user-session=ubuntu-touch -greeter-session=qml-phone-greeter +greeter-session=unity8-greeter autologin-user=phablet autologin-in-background=true From 3c012df85d1806d9d66786d0eb393929d7e83657 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Wed, 14 Aug 2013 12:51:54 -0400 Subject: [PATCH 3/4] Drop defined user/greeter sessions, that gets set in the respective packages --- .../ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf b/live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf index e23200a8..60e4f597 100644 --- a/live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf +++ b/live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf @@ -1,5 +1,3 @@ [SeatDefaults] -user-session=ubuntu-touch -greeter-session=unity8-greeter autologin-user=phablet autologin-in-background=true From 6d80ab3c54b82b4ef1cf6f646763ec0edc0438b7 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Mon, 9 Sep 2013 12:23:44 -0400 Subject: [PATCH 4/4] Add changelog message, use new-style lightdm.conf.d file, and don't set autologin-in-background until we can have a real greeter in Touch --- debian/changelog | 6 ++++++ .../{lightdm.conf => lightdm.conf.d/90-phablet.conf} | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) rename live-build/ubuntu-touch/includes.chroot/etc/lightdm/{lightdm.conf => lightdm.conf.d/90-phablet.conf} (56%) diff --git a/debian/changelog b/debian/changelog index 0793f633..7276f443 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.185) saucy; urgency=low + + * Configure LightDM, if installed, to autologin the phablet user + + -- Michael Terry Mon, 09 Sep 2013 12:21:13 -0400 + livecd-rootfs (2.184) saucy; urgency=low * Revert to always using archive-team.internal in 60-install-click.chroot diff --git a/live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf b/live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf.d/90-phablet.conf similarity index 56% rename from live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf rename to live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf.d/90-phablet.conf index 60e4f597..6485c8ce 100644 --- a/live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf +++ b/live-build/ubuntu-touch/includes.chroot/etc/lightdm/lightdm.conf.d/90-phablet.conf @@ -1,3 +1,2 @@ [SeatDefaults] autologin-user=phablet -autologin-in-background=true