Merge from trunk

debian/changelog

@@ -1,3 +1,18 @@
+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 <ogra@ubuntu.com>  Wed, 14 Aug 2013 11:01:47 +0200
+
+livecd-rootfs (2.172) saucy; urgency=low
+
+  * Reenabling click package installation hook. 
+
+ -- Sergio Schvezov <sergio.schvezov@canonical.com>  Sun, 11 Aug 2013 19:03:53 -0300
+
 livecd-rootfs (2.171) saucy; urgency=low
 
   * seems unlike my local build the buildd doesnt get along with links, use

live-build/ubuntu-touch/hooks/01-setup_user.chroot

@@ -9,11 +9,14 @@ 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\+\).*/\11001/g' /etc/login.defs
+sed -i 's/^\(UID_MIN\s\+\).*/\11002/g' /etc/login.defs
 
 mkdir -p /home/$USER/Music
 mkdir -p /home/$USER/Pictures

live-build/ubuntu-touch/hooks/60-install-click.chroot

@@ -1,11 +1,5 @@
 #!/bin/sh
 
-cat <<EOF
-Click package installation temporarily disabled until desktop/AppArmor
-integration is all working properly.
-EOF
-exit 0
-
 set -e
 
 echo "Setting up click packages"