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

[Tom Gall]

major changes in this proposal is:

remove script that touched ~linaro/.ICEauthority (not needed)

add script to adjust gdm/PostSession/Default script to restart gdm on logout

=== modified file 'chroot_local-hooks/02-add_linaro_to-admin.sh'
--- chroot_local-hooks/02-add_linaro_to-admin.sh	2010-09-27 10:27:50 +0000
+++ chroot_local-hooks/02-add_linaro_to-admin.sh	2010-10-06 22:20:53 +0000
@@ -1,4 +1,12 @@
-#!/bin/sh  
+#!/bin/sh -x 
+
+/bin/egrep  -i "^admin" /etc/group
+if [ $? -eq 0 ]; then
+   echo "User admin exists in /etc/group"
+else
+   echo "User admin does not exists in /etc/group must create"
+   groupadd admin
+fi
 
 echo "I: add linaro to admin group"
 usermod -G admin linaro

=== modified file 'chroot_local-hooks/04-update_gdm_custom.sh'
--- chroot_local-hooks/04-update_gdm_custom.sh	2010-09-27 10:28:51 +0000
+++ chroot_local-hooks/04-update_gdm_custom.sh	2010-10-06 22:20:53 +0000
@@ -7,12 +7,18 @@
 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/05-touch_ICEauthority.sh'
--- chroot_local-hooks/05-touch_ICEauthority.sh	2010-09-27 10:29:32 +0000
+++ chroot_local-hooks/05-touch_ICEauthority.sh	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh  
-touch ~linaro/.ICEauthority
-chown linaro:linaro ~linaro/.ICEauthority
-chmod 644 ~linaro/.ICEauthority

=== added file 'chroot_local-hooks/06-update_gdm_PostSession.sh'
--- chroot_local-hooks/06-update_gdm_PostSession.sh	1970-01-01 00:00:00 +0000
+++ chroot_local-hooks/06-update_gdm_PostSession.sh	2010-10-06 22:20:53 +0000
@@ -0,0 +1,19 @@
+#!/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
+