Merge lp:~darkxst/casper/ubuntu-gnome-casper-tweaks into lp:ubuntu/quantal/casper

[Tim]

A couple more casper tweaks are required for the Ubuntu GNOME Remix Live CD

- Add a new script to remove the password dialog from gdm, for the live user (who doesnt have a password).
- add ubiquity to gnome-shell favourites.

[Stéphane Graber (stgraber)]

The change looks reasonable, however it doesn't account for the fact that you can boot the system multiple time when using casper with persistent storage, in such case it looks like you'll be generating invalid javascript (by adding an extra line every boot) and will be appending an extra ubiquity at every boot too.

review: Needs Fixing

[lp:~darkxst/casper/ubuntu-gnome-casper-tweaks]

1087. By Tim on 2012-10-03

Don't allow recursive matching

1088. By Tim on 2012-10-03

move override to 22desktop_settings.

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-02 22:13:38 +0000
+++ debian/changelog	2012-10-03 05:46:21 +0000
@@ -1,3 +1,10 @@
+casper (1.327) UNRELEASED; urgency=low
+
+  * add gnome-shell favorites tweak to 25adduser
+  * Add 16gdmnopasswd script, removes gdm password dialog for live user.
+
+ -- Tim Lunn <[e-mail]>  Wed, 03 Oct 2012 15:42:07 +1000
+
 casper (1.326) quantal; urgency=low
 
   * 22desktop_settings:

=== added file 'scripts/casper-bottom/16gdmnopasswd'
--- scripts/casper-bottom/16gdmnopasswd	1970-01-01 00:00:00 +0000
+++ scripts/casper-bottom/16gdmnopasswd	2012-10-03 05:46:21 +0000
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+PREREQ=""
+DESCRIPTION="Setting up automatic login..."
+
+prereqs()
+{
+       echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+       prereqs
+       exit 0
+       ;;
+esac
+
+. /scripts/casper-functions
+
+log_begin_msg "$DESCRIPTION"
+
+STRING1="               if (this._userManager.list_users().length > 2 || !(this._userManager.get_user('ubuntu')))\n \
+                            return GdmUtil.fadeInActor(this._promptLabel);\n \
+                        else\n \
+                            this._promptLabel.hide();"
+STRING2="               if (this._userManager.list_users().length > 2 || !(this._userManager.get_user('ubuntu')))\n \
+                            return GdmUtil.fadeInActor(this._promptEntry);\n \
+                        else\n \
+                            this._promptEntry.hide();"
+
+GDMLoginFile=/root/usr/share/gnome-shell/js/gdm/loginDialog.js
+
+if [ -f $GDMLoginFile ]; then
+    # Configure GDM autologin
+
+    sed -i -e "s/^.*return GdmUtil.fadeInActor(this._promptLabel);\$/$STRING1/" \
+           -e "s/^.*return GdmUtil.fadeInActor(this._promptEntry);\$/$STRING2/" \
+           $GDMLoginFile
+fi
+
+
+log_end_msg

=== modified file 'scripts/casper-bottom/25adduser'
--- scripts/casper-bottom/25adduser	2012-10-02 15:29:21 +0000
+++ scripts/casper-bottom/25adduser	2012-10-03 05:46:21 +0000
@@ -100,6 +100,7 @@
 #GDM
 if [ -d /root/etc/gdm ]; then
     sed -i '/^[UG]ID_MIN/s/\<1000$/ 999/' /root/etc/login.defs
+    sed -i "s/'epiphany.desktop',/'ubiquity-gtkui.desktop', 'epiphany.desktop',/" /root/usr/share/glib-2.0/schemas/10_gnome-shell.gschema.override
 fi
 
 #Kubuntu