Merge lp:~tom-gall/linaro/live-helper-alip-setup-default-user into lp:~linaro-maintainers/linaro/live-helper.config.maverick.alip

[Tom Gall]

- remove script to touch .ICEauthority (not needed)

- small update to handle case where the admin group might not exist yet

- remove script to update to /etc/gdm/custom.conf file, instead utilize lh chroot_local-include mechanism

[Jamie Bennett (jamiebennett)]

Looks sane, merging.

review: Approve

=== removed file 'chroot_local-hooks/04-update_gdm_custom.sh'
--- chroot_local-hooks/04-update_gdm_custom.sh	2010-10-06 22:02:21 +0000
+++ chroot_local-hooks/04-update_gdm_custom.sh	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-#!/bin/sh  
-
-echo "I: create / modify /etc/gdm/custom.conf"
-
-if [ -e /etc/gdm/custom.conf ]; then
-
-sed -i 's/\(AutomaticLogin=\).*/\1linaro/g' /etc/gdm/custom.conf
-sed -i 's/\(AutomaticLoginEnable=\).*/\1true/g' /etc/gdm/custom.conf
-
-
-else
-
-cat > /etc/gdm/custom.conf <<EOF
-[daemon]
-DefaultSession=xubuntu
-
-AutomaticLoginEnable=true
-AutomaticLogin=linaro
-
-[greeter]
-Include=linaro
-EOF
-
-fi
 
=== removed file 'chroot_local-hooks/06-update_gdm_PostSession.sh'
--- chroot_local-hooks/06-update_gdm_PostSession.sh	2010-10-06 22:09:53 +0000
+++ chroot_local-hooks/06-update_gdm_PostSession.sh	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#!/bin/sh  
-
-echo "I: create / modify /etc/gdm/PostSession/Default"
-
-if [ -e /etc/gdm/PostSession/Default ]; then
-
-# there's no point fixing it up, let's just do the right thing
-rm /etc/gdm/PostSession/Default
-
-fi
-
-cat > /etc/gdm/PostSession/Default <<EOF
-#!/bin/sh
-
-/sbin/restart gdm
-
-exit 0
-EOF
-
 
=== added directory 'chroot_local-includes/etc'
=== added directory 'chroot_local-includes/etc/gdm'
=== added file 'chroot_local-includes/etc/gdm/custom.conf'
--- chroot_local-includes/etc/gdm/custom.conf	1970-01-01 00:00:00 +0000
+++ chroot_local-includes/etc/gdm/custom.conf	2010-10-11 16:03:41 +0000
@@ -0,0 +1,9 @@
+[daemon]
+DefaultSession=xubuntu
+
+AutomaticLoginEnable=true
+AutomaticLogin=linaro
+
+[greeter]
+Include=linaro
+