From 6264d9ddaaa78b356fe1a70597b43cf59279aab8 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 14 Aug 2013 11:01:47 +0200 Subject: [PATCH] Import patches-unapplied version 2.173 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: 4570179e6cd0b4008476f210161ed2284f83568c New changelog entries: [Michael Terry] * Add phablet user to nopasswdlogin group on Touch images * Switch min uid to 1002 to prevent system users from showing in the greeter on Touch images --- debian/changelog | 9 +++++++++ live-build/ubuntu-touch/hooks/01-setup_user.chroot | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/debian/changelog b/debian/changelog index 15359759..282a2725 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.173) saucy; urgency=low + + [Michael Terry] + * Add phablet user to nopasswdlogin group on Touch images + * Switch min uid to 1002 to prevent system users from showing in + the greeter on Touch images + + -- Oliver Grawert Wed, 14 Aug 2013 11:01:47 +0200 + livecd-rootfs (2.172) saucy; urgency=low * Reenabling click package installation hook. diff --git a/live-build/ubuntu-touch/hooks/01-setup_user.chroot b/live-build/ubuntu-touch/hooks/01-setup_user.chroot index b214eb58..20883e13 100755 --- a/live-build/ubuntu-touch/hooks/01-setup_user.chroot +++ b/live-build/ubuntu-touch/hooks/01-setup_user.chroot @@ -9,9 +9,15 @@ adduser --gecos $USER --disabled-login $USER --uid $UGID echo "I: set user $USER password to $USER" echo "$USER:$USER" | chpasswd +echo "I: allowing user to log in without password" +gpasswd -a $USER nopasswdlogin + adduser --gecos system --no-create-home --disabled-login --disabled-password system --uid 1000 adduser --gecos radio --no-create-home --disabled-login --disabled-password radio --uid 1001 +# Prevent the system user from being presented in the greeter by bumping MIN_UID +sed -i 's/^\(UID_MIN\s\+\).*/\11002/g' /etc/login.defs + mkdir -p /home/$USER/Music mkdir -p /home/$USER/Pictures mkdir -p /home/$USER/Videos