Merge lp:~ivoks/casper/casper-virtio into lp:casper

[Ante Karamatić]

At the moment, casper doesn't work with live system located on virtio device. This simple change makes that possible.

[Colin Watson (cjwatson)]

Could you please re-propose this for merging into lp:ubuntu/casper
rather than lp:casper, so that we get a useful merge diff? Thanks.

[Ante Karamatić (ivoks)]

Ups. Sorry about that.

Unmerged revisions

961. By Ante Karamatić on 2011-10-06

* scripts/casper:
  - enable use of virtio devices in is_nice_device()

960. By Luke Yelavich on 2011-09-14

releasing version 1.284

959. By Luke Yelavich on 2011-09-14

Make sure profile settings are not set up twice

958. By Luke Yelavich on 2011-09-14

* Fix typo
* Write session data if a starttup script is created

957. By Luke Yelavich on 2011-09-14

* ubiquity-hooks/30accessibility:
  - Make sure that accessibility profile settings are properly applied at
    install time, even if the user decided to try Ubuntu first, and then
    run the install from the desktop
  - Copy any existing orca configuration to the target system

956. By Luke Yelavich on 2011-09-14

Reformat the changelog to be easier to comprehend

955. By Luke Yelavich on 2011-09-14

* Set correct permissions for the orca config directory once the config files
  have been created
* Make sure the startup script checks take into account the ability to be run
  from the initramfs

954. By Luke Yelavich on 2011-09-13

* Make sure that accessibility profile settings are properly applied at
  install time, even if the user decided to try Ubuntu first, and then
  run the install from the desktop
* Add some other needed settings for various profiles for use in the login
  manager

953. By Luke Yelavich on 2011-09-12

* bin/casper-a11y-enable: Set the session by calling AccountService via dbus
  instead of using lightdm commands, as we cannot run lightdm-set-defaults
  as a user
* Add some extra spaces to make sure the startup scripts used to set a11y
  settings are syntactically correct

952. By Martin Pitt on 2011-09-07

releasing version 1.283

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2011-10-06 10:04:28 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+native = True
 
=== added file 'bin/casper-a11y-enable'
--- bin/casper-a11y-enable	1970-01-01 00:00:00 +0000
+++ bin/casper-a11y-enable	2011-10-06 10:04:28 +0000
@@ -0,0 +1,668 @@
+#!/bin/sh
+#
+# casper-a11y-enable - Sets accessibility profile settings for the live session
+#                      or installed system.
+#
+# This script is called by several other scripts, as well as ubiquity itself to
+# set up accessibility profile settings for use in the live environment and on
+# an installed system.
+#
+# Copyright (C) 2011, Canonical Ltd.
+#
+# Author:
+# - Luke Yelavich <[e-mail]>
+#
+# This script is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 2 of the License, or at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this application; if not, write to the Free Software Foundation, Inc., 51
+# Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+##################################################################################
+
+set -e
+
+### PROFILE SETTINGS METHODS BEGIN HERE ###
+# The methods that are used to set profile data have been placed as close to the
+# top of this file as possible, so they are easy to locate, and will hopefully
+# save time when making smaller changes.
+
+# Common settings for low vision profiles. Any change you make here will affect
+# all low vision profiles, for both the user session and login manager.
+set_common_lowvis()
+{
+	gset set org.gnome.desktop.interface toolkit-accessibility true
+	gct -s -t bool /desktop/gnome/interface/accessibility true
+	gct -s -t bool /apps/gksu/disable-grab true
+	gset set org.gnome.yelp show-cursor true
+	add_sudoers_file
+}
+
+# Common settings for motor profiles. Any change you make here will affect
+# all motor profiles, for both the user session and login manager.
+set_common_motor()
+{
+	gset set org.gnome.desktop.a11y.keyboard enable true
+	gct -s -t bool /apps/gksu/disable-grab true
+	gset set org.gnome.desktop.a11y.keyboard stickykeys-enable true
+	gset set org.gnome.desktop.a11y.keyboard stickykeys-two-key-off false
+}
+
+# Settings for the high-contrast profile.
+set_high_contrast()
+{
+	gset set org.gnome.desktop.interface icon-theme HighContrast
+	gset set org.gnome.desktop.interface monospace-font-name "monospace 18"
+	gset set org.gnome.desktop.interface font-name "sans 18"
+	gset set org.gnome.desktop.background picture-uri ""
+	gset set org.gnome.desktop.background picture-options none
+	gset set org.gnome.desktop.background primary-color \#666666
+	gset set org.gnome.desktop.background secondary-color \#7F7F7F
+	gset set org.gnome.desktop.background color-shading-type solid
+	gset set org.gnome.desktop.interface cursor-size 48
+	gset set org.gnome.desktop.interface cursor-theme whiteglass
+	kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/
+	if [ -d $CHROOT_DIR/usr/share/xubuntu-default-settings/accessibility ]; then
+		cp -a $CHROOT_DIR/usr/share/xubuntu-default-settings/accessibility/* $CHROOT_DIR/etc/xdg/
+	fi
+}
+
+set_magnifier()
+{
+	# Ubuntu
+	gset set org.gnome.desktop.a11y.applications screen-magnifier-enabled true
+	set_orca_config magnifier
+
+	# Kubuntu
+	kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-impairment/
+}
+
+set_blindness()
+{
+	gset set org.gnome.desktop.a11y.applications screen-reader-enabled true
+	gset set org.gnome.Empathy.conversation theme classic
+	set_orca_config speech
+	set_session ubuntu-2d
+
+	if [ -n "$SET_LOGIN" ]; then
+		gset_lightdm set org.gnome.desktop.interface toolkit-accessibility true
+		gset_lightdm set org.gnome.desktop.a11y.applications screen-reader-enabled true
+	fi
+}
+
+set_braille()
+{
+	gset set org.gnome.desktop.a11y.applications screen-reader-enabled true
+	gset set org.gnome.Empathy.conversation theme classic
+	set_orca_config braille
+	set_session ubuntu-2d
+
+	if [ -n "$SET_LOGIN" ]; then
+		gset_lightdm set org.gnome.desktop.interface toolkit-accessibility true
+		gset_lightdm set org.gnome.desktop.a11y.applications screen-reader-enabled true
+	fi
+}
+
+set_keyboard_modifiers()
+{
+	gset set org.gnome.desktop.a11y.keyboard mousekeys-enable true
+	gset set org.gnome.desktop.a11y.keyboard stickykeys-modifier-beep true
+	gset set org.gnome.settings-daemon.peripherals.keyboard repeat true
+	gset set org.gnome.settings-daemon.peripherals.keyboard delay 700
+	gset set org.gnome.settings-daemon.peripherals.keyboard repeat-interval 10
+	kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/
+	if [ -e $CHROOT_DIR/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
+		sed -i 's/0/1/' $CHROOT_DIR/etc/xdg/xfce4/mcs_settings/keyboard.xml
+	fi
+}
+
+set_onscreen_keyboard()
+{
+	gset set org.gnome.desktop.interface toolkit-accessibility true
+	gset set org.gnome.desktop.a11y.keyboard stickykeys-modifier-beep false
+	gset set org.gnome.desktop.a11y.applications screen-keyboard-enabled true
+
+	if [ -n "$SET_LOGIN" ]; then
+		gset_lightdm set org.gnome.desktop.interface toolkit-accessibility true
+		gset_lightdm set org.gnome.desktop.a11y.applications screen-keyboard-enabled true
+	fi
+
+	kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/
+	if [ -e $CHROOT_DIR/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
+		sed -i '/Sticky/ s/0/1/' $CHROOT_DIR/etc/xdg/xfce4/mcs_settings/keyboard.xml
+	fi
+}
+### PROFILE SETTINGS METHODS END HERE ###
+
+help()
+{
+	cat <<EOF
+Usage: $0 		[-chroot=<root>] [-user=<username>] [-l|-login]
+			[-i|-initramfs] [-d|-debug] <profilename>
+
+-h, -help		Display this help.
+-chroot=<root>		Chroot into <root> to apply profile settings, requires a
+			username to be specified, see below.
+-user=<username>	The user where a profile is to be applied, requires the
+			script to be run as root. If no username is given, it
+			is assumed that you wish to apply profile settings for
+			the current user.
+-l, -login		Apply some of the selected profile settings to the
+			login manager. Currently this is hard-coded to lightdm.
+			This requires root privileges.
+-i, -initramfs		Indicate that the script is being called from the
+			initramfs. Allows the script to assume some values
+			that can not otherwise be easily determined in an
+			initramfs environment. Requires that a chroot dir and
+			user name are specified. See above.
+-script			Create a script to be run at system boot that will
+			apply all settings for the specified user and for
+			login. This script will then remove itself. This is
+			needed to work around gsettings not working in a chroot
+			environment with no dconf service running.
+-d|-debug		Enable debugging output.
+<profilename>		The name of the profile you wish to apply, see below.
+
+The profiles currently available are as follows:
+high-contrast	For users with lesser visual impairments who only need a high
+		contrast theme, mouse cursor and icons.
+magnifier	For users with moderate visual impairments who require a screen
+		magnifier.
+blindness	Users who are partially or completely blind who require a screen
+		reader.
+braille		Users who are partially or completely blind who require a screen
+		reader and wish to use a Braille display.
+keyboard-modifiers
+		Users who have minor motor impairments who require slight
+		changes to the way their keyboard behaves.
+onscreen-keyboard
+		Users with motor impairments who require the use of an
+		on-screen keyboard.
+EOF
+}
+
+gset()
+{
+	if [ -n "$GLIBBIN_VERSION" ]; then
+		if [ -n "$STARTUP_SCRIPT" ]; then
+			echo "gsettings " "$@" >> $CHROOT_DIR/usr/bin/a11y-profile-settings
+		else
+			$DO_CHROOT $DO_SUDO gsettings "$@"
+		fi
+	fi
+}
+
+gset_lightdm()
+{
+	if [ -n "$GLIBBIN_VERSION" ]; then
+		if [ -n "$STARTUP_SCRIPT" ]; then
+			echo "gsettings " "$@" >> $CHROOT_DIR/usr/bin/a11y-profile-settings-lightdm
+		else
+			$DO_CHROOT sudo -u lightdm gsettings "$@"
+		fi
+	fi
+}
+
+# Soon to be deprecated
+gct()
+{
+	if [ -n "$GCONF_VERSION" ]; then
+		if [ -n "$STARTUP_SCRIPT" ]; then
+			echo "gconftool-2 " "$@" >> $CHROOT_DIR/usr/bin/a11y-profile-settings
+		else
+			$DO_CHROOT $DO_SUDO gconftool-2 "$@"
+		fi
+	fi
+}
+
+gct_lightdm()
+{
+	if [ -n "$GCONF_VERSION" ]; then
+		if [ -n "$STARTUP_SCRIPT" ]; then
+			echo "gconftool-2 " "$@" >> $CHROOT_DIR/usr/bin/a11y-profile-settings-lightdm
+		else
+			$DO_CHROOT sudo -u lightdm gconftool-2 "$@"
+		fi
+	fi
+}
+
+kderc_addtoprefixes()
+{
+	if [ -e $CHROOT_DIR/etc/kde4rc ]; then
+		sed -i "s|\\(prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/\\)|\\1,$1|" $CHROOT_DIR/etc/kde4rc
+	fi
+}
+
+add_sudoers_file()
+{
+	if [ "$HOME" = "/root" ] || [ -n "$IN_INITRAMFS" ]; then
+	        cat <<EOF > $CHROOT_DIR/etc/sudoers.d/a11y-sudo
+# To allow accessibility in GTK to work with sudo.
+Defaults        env_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"
+EOF
+		chmod 0440 $CHROOT_DIR/etc/sudoers.d/a11y-sudo
+	else
+		echo "Warning: Could not create sudoers file due to no root privileges."
+	fi
+}
+
+# Unfortunately this bloats this script somewhat, but orca doesn't seem to want
+# to deal with individual settings/a small config fragment.
+# Arguments: $1 = speech/magnifier/braille (which
+# accessibility feature to turn on)
+set_orca_config()
+{
+	# Yes, we could use $HOME, but enquiring about $HOME is not easy when
+	# Outside the target environment, particularly when running from the
+	# initramfs, and this script is not everything for everybody anyway.
+	if [ -n "$ORCA_VERSION" ] && ! [ -f "$CHROOT_DIR/home/$USER_NAME/.local/share/orca/user-settings.conf" ]; then
+		mkdir -p "$CHROOT_DIR/home/$USER_NAME/.local/share/orca"
+
+		cat <<EOF > "$CHROOT_DIR/home/$USER_NAME/.local/share/orca/user-settings.conf"
+{
+    "pronunciations": {}, 
+    "keybindings": {}, 
+    "profiles": {
+        "default": {
+            "profile": [
+                "Default", 
+                "default"
+            ], 
+            "pronunciations": {}, 
+            "keybindings": {}
+        }
+    }, 
+    "general": {
+        "speakCellHeaders": true, 
+        "magEdgeMargin": 0, 
+        "brailleContractionTable": "", 
+        "magPointerFollowsFocus": false, 
+        "magTextTrackingMode": 2, 
+        "magZoomerBorderSize": 1, 
+        "brailleAlignmentStyle": 0, 
+        "enableEchoByWord": false, 
+        "enableMagZoomerColorInversion": false, 
+        "magCursorSize": 32, 
+        "magSmoothingMode": 0, 
+        "magZoomerLeft": 840, 
+        "showMainWindow": true, 
+        "sayAllStyle": 1, 
+        "brailleSelectorIndicator": 192, 
+        "presentDateFormat": "%x", 
+        "magContrastLevel": 0, 
+        "magMouseTrackingMode": 0, 
+        "speakCellSpan": true, 
+        "progressBarUpdateInterval": 10, 
+        "speakCellCoordinates": true, 
+        "enablePauseBreaks": true, 
+        "brailleEOLIndicator": " $l", 
+        "verbalizePunctuationStyle": 1, 
+        "progressBarVerbosity": 1, 
+        "enableSpeech": false, 
+        "enableBraille": false, 
+        "chatAnnounceBuddyTyping": false, 
+        "speakMultiCaseStringsAsWords": false, 
+        "enableBrailleGrouping": false, 
+        "readTableCellRow": true, 
+        "speechServerFactory": "speechdispatcherfactory", 
+        "textAttributesBrailleIndicator": 0, 
+        "enableMagCursorExplicitSize": false, 
+        "messageVerbosityLevel": 1, 
+        "enableMagLiveUpdating": true, 
+        "enableSpeechIndentation": false, 
+        "enableKeyEcho": true, 
+        "magHideCursor": false, 
+        "magZoomerBorderColor": "#000000", 
+        "magPointerFollowsZoomer": true, 
+        "mouseDwellDelay": 0, 
+        "magBrightnessLevelRed": 0, 
+        "enableMagnifier": false, 
+        "magZoomFactor": 4.0, 
+        "activeProfile": [
+            "Default", 
+            "default"
+        ], 
+        "enableMagZoomerBorder": false, 
+        "flashVerbosityLevel": 1, 
+        "enableFlashMessages": true, 
+        "speechServerInfo": null, 
+        "presentToolTips": false, 
+        "flashIsPersistent": false, 
+        "skipBlankCells": false, 
+        "firstStart": false, 
+        "largeObjectTextLength": 75, 
+        "enableEchoBySentence": false, 
+        "magContrastLevelBlue": 0, 
+        "magContrastLevelRed": 0, 
+        "enableContractedBraille": false, 
+        "orcaModifierKeys": [
+            "Insert", 
+            "KP_Insert"
+        ], 
+        "enableMagCursor": true, 
+        "speechRequiredStateString": "required", 
+        "quitOrcaNoConfirmation": false, 
+        "brailleRequiredStateString": "required", 
+        "magCursorColor": "#000000", 
+        "enablePositionSpeaking": false, 
+        "magZoomerType": 0, 
+        "onlySpeakDisplayedText": false, 
+        "enableProgressBarUpdates": true, 
+        "wrappedStructuralNavigation": true, 
+        "chatRoomHistories": false, 
+        "brailleVerbosityLevel": 1, 
+        "enableFunctionKeys": true, 
+        "enableModifierKeys": true, 
+        "magCrossHairColor": "#000000", 
+        "enableTutorialMessages": false, 
+        "enableActionKeys": true, 
+        "speakBlankLines": true, 
+        "magColorFilteringMode": 0, 
+        "magZoomerRight": 1680, 
+        "keyboardLayout": 1, 
+        "magTargetDisplay": "", 
+        "disableBrailleEOL": false, 
+        "magZoomerTop": 0, 
+        "magSourceDisplay": "", 
+        "enableDiacriticalKeys": false, 
+        "enableMnemonicSpeaking": false, 
+        "enabledBrailledTextAttributes": "size:; family-name:; weight:400; indent:0; underline:none; strikethrough:false; justification:left; style:normal; text-spelling:none;", 
+        "speechVerbosityLevel": 1, 
+        "enableMagCrossHair": true, 
+        "enableBrailleMonitor": false, 
+        "voices": {
+            "default": {
+                "established": false
+            }, 
+            "uppercase": {
+                "average-pitch": 5.6
+            }, 
+            "system": {
+                "established": false
+            }, 
+            "hyperlink": {
+                "established": false
+            }
+        }, 
+        "magContrastLevelGreen": 0, 
+        "brailleFlashTime": 5000, 
+        "magCrossHairSize": 16, 
+        "enableMouseReview": false, 
+        "enableNavigationKeys": false, 
+        "magBrightnessLevelGreen": 0, 
+        "chatSpeakRoomName": false, 
+        "startingProfile": [
+            "Default", 
+            "default"
+        ], 
+        "enableLockingKeys": true, 
+        "profile": [
+            "Default", 
+            "default"
+        ], 
+        "brailleRolenameStyle": 1, 
+        "brailleLinkIndicator": 192, 
+        "enableEchoByCharacter": false, 
+        "magBrightnessLevelBlue": 0, 
+        "enableBrailleContext": true, 
+        "magControlTrackingMode": 2, 
+        "magZoomerBottom": 1050, 
+        "enablePrintableKeys": true, 
+        "enabledSpokenTextAttributes": "size:; family-name:; weight:400; indent:0; underline:none; strikethrough:false; justification:left; style:normal; paragraph-style:; text-spelling:none;", 
+        "chatMessageVerbosity": 0, 
+        "presentTimeFormat": "%X", 
+        "magBrightnessLevel": 0, 
+        "presentRequiredState": false, 
+        "enableMagCrossHairClip": false
+    }
+}
+EOF
+
+		case "$1" in
+			magnifier)
+				sed -i -e 's/\"enableMagnifier\": false/\"enableMagnifier\": true/' "$CHROOT_DIR/home/$USER_NAME/.local/share/orca/user-settings.conf"
+			;;
+			speech)
+				sed -i -e 's/\"enableSpeech\": false/\"enableSpeech\": true/' "$CHROOT_DIR/home/$USER_NAME/.local/share/orca/user-settings.conf"
+			;;
+			braille)
+				sed -i -e 's/\"enableBraille\": false/\"enableBraille\": true/' "$CHROOT_DIR/home/$USER_NAME/.local/share/orca/user-settings.conf"
+			;;
+			*)
+			;;
+		esac
+
+		if [ "$HOME" = "/root" ] || [ -n "$IN_INITRAMFS" ]; then
+			chmod 755 "$CHROOT_DIR/home/$USER_NAME/.local/share/orca"
+			$DO_CHROOT chown $USER_NAME.$USER_NAME -R "/home/$USER_NAME/.local"
+		fi
+	fi
+}
+
+set_session()
+{
+	local uid=$($DO_CHROOT getent passwd $USER_NAME | awk -F: '{print $3}')
+
+	# We need to start the accounts daemon somehow and wait for a half second
+	# for it to get ready. Calling on AccountsService to set the X session with
+	# only one call seems to error out, so querying the user by name seems to get
+	# the daemon going.
+	if [ -n "$STARTUP_SCRIPT" ]; then
+		# I don't like having to write the file manually, but during testing I was
+		# unable to get calls via dbus-send to work.
+		cat <<EOF > $CHROOT_DIR/var/lib/AccountsService/users/$USER_NAME
+
+[User]
+XSession=ubuntu-2d
+EOF
+	else
+		dbus-send --type=method_call --system --dest=org.freedesktop.Accounts /org/freedesktop/Accounts org.freedesktop.Accounts.FindUserByName string:$USER_NAME
+		sleep 1
+		dbus-send --type=method_call --system --reply-timeout=1000 --dest=org.freedesktop.Accounts /org/freedesktop/Accounts/User$uid org.freedesktop.Accounts.User.SetXSession string:$1
+	fi
+}
+
+create_conf()
+{
+	cat <<EOF > /tmp/casper-a11y.conf
+UBIQUITY_A11Y_PROFILE=$1
+EOF
+}
+
+if [ "$#" = "0" ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
+	help
+	exit 1
+fi
+
+while [ "$#" -gt 0 ];
+do
+	case "$1" in
+		-chroot=*)
+			CHROOT_DIR="${1#-chroot=}"
+			DO_CHROOT="chroot $CHROOT_DIR"
+			shift
+			continue
+		;;
+		-user=*)
+			USER_NAME="${1#-user=}"
+			DO_SUDO="sudo -u $USER_NAME"
+			shift
+			continue
+		;;
+		-l|-login)
+			SET_LOGIN=1
+			shift
+			continue
+		;;
+		-i|-initramfs)
+			IN_INITRAMFS=1
+			shift
+			continue
+		;;
+		-d|-debug)
+			set -x
+			shift
+			continue
+		;;
+		-script)
+			STARTUP_SCRIPT=1
+			shift
+			continue
+		;;
+		*)
+			PROFILE_NAME="$1"
+			shift
+			continue
+		;;
+	esac
+done
+
+if [ -n "$IN_INITRAMFS" ] && [ -z "$CHROOT_DIR" ]; then
+	echo "Error: In initramfs, but no chroot directory specified."
+	help
+	exit 1
+elif [ -n "$IN_INITRAMFS" ] && [ -z "$USER_NAME" ]; then
+	echo "Error: In initramfs, but no username specified."
+	help
+	exit 1
+fi
+
+if [ -n "$SET_LOGIN" ] && [ "$HOME" != "/root" ] && [ -z "$IN_INITRAMFS" ]; then
+	echo "Error: Setting up accessibility for login requires root privileges."
+	help
+	exit 1
+fi
+
+
+if [ -n "$CHROOT_DIR" ] || [ -n "$USER_NAME" ]; then
+	if [ "$HOME" != "/root" ] && [ -z "$IN_INITRAMFS" ]; then
+		echo "Error: You are not running as root."
+		help
+		exit 1
+	fi
+fi
+
+if [ -n "$CHROOT_DIR" ]; then
+	if [ ! -d "$CHROOT_DIR" ]; then
+		echo "Error: Target chroot directory does not exist, or you do not have permission to access it."
+		exit 1
+	fi
+	if [ -z "$IN_INITRAMFS" ] && ! type chroot >/dev/null 2>&1 ; then
+		echo "Error: Chroot command not available in running environment."
+		exit 1
+	fi
+fi
+
+if [ -n "$STARTUP_SCRIPT" ]; then
+	if [ -z "$USER_NAME" ]; then
+		echo "Error: You have requested to create a startup script, but no user was specified."
+		exit 1
+	fi
+	if [ "$HOME" != "/root" ] && [ -z "$IN_INITRAMFS" ]; then
+		echo "Error: You have requested to create a startup script, but you do not have root"
+		echo "privileges."
+		exit 1
+	fi
+	if [ -z "$CHROOT_DIR" ]; then
+		echo "Error: You have requested to create a startup script, but you did not specify"
+		echo "a target directory to chroot to."
+		exit 1
+	fi
+fi
+
+# If no username was entered on the command line, grab the name of the current
+# user, so we can write files to their home directory.
+if [ -z "$USER_NAME" ]; then
+	if [ -z "$USER" ]; then
+		USER_NAME="${HOME#/home/}"
+	else
+		USER_NAME="$USER"
+	fi
+fi
+
+# Check to see if a few necessary packages are present in the target
+# environment.
+GCONF_VERSION=$($DO_CHROOT /usr/bin/dpkg-query -W --showformat='${Version}' gconf2 2>/dev/null) || GCONF_VERSION=""
+GLIBBIN_VERSION=$($DO_CHROOT /usr/bin/dpkg-query -W --showformat='${Version}' libglib2.0-bin 2>/dev/null) || GLIBBIN_VERSION=""
+ORCA_VERSION=$($DO_CHROOT /usr/bin/dpkg-query -W --showformat='${Version}' gnome-orca 2>/dev/null) || ORCA_VERSION=""
+
+if [ -n "$STARTUP_SCRIPT" ]; then
+	cat <<EOF > $CHROOT_DIR/etc/init/a11y-profile-settings.conf
+# a11y-profile-settings - A job to set up accessibility settings
+
+description     "Accessib ility profile settings"
+
+start on runlevel [2345]
+
+umask 022
+
+script
+    sudo -u $USER_NAME /usr/bin/dbus-launch --exit-with-session /usr/bin/a11y-profile-settings
+    sudo -u lightdm /usr/bin/dbus-launch --exit-with-session /usr/bin/a11y-profile-settings-lightdm
+    rm /usr/bin/a11y-profile-settings /usr/bin/a11y-profile-settings-lightdm
+    rm /etc/init/a11y-profile-settings.conf
+end script
+EOF
+	cat <<EOF > $CHROOT_DIR/usr/bin/a11y-profile-settings
+#!/bin/sh
+
+# Created by the casper accessibility profile settings script on
+# $(date).
+
+# This script deletes itself once run.
+
+EOF
+	cat <<EOF > $CHROOT_DIR/usr/bin/a11y-profile-settings-lightdm
+#!/bin/sh
+
+# Created by the casper accessibility profile settings script on
+# $(date).
+
+# This script deletes itself once run.
+
+EOF
+fi
+
+case $PROFILE_NAME in
+	high-contrast)
+		set_common_lowvis
+		set_high_contrast
+		create_conf $PROFILE_NAME
+	;;
+	magnifier)
+		set_common_lowvis
+		set_magnifier
+		create_conf $PROFILE_NAME
+	;;
+	blindness)
+		set_common_lowvis
+		set_blindness
+		create_conf screen-reader
+	;;
+	braille)
+		set_common_lowvis
+		set_braille
+		create_conf $PROFILE_NAME
+	;;
+	keyboard-modifiers)
+		set_common_motor
+		set_keyboard_modifiers
+		create_conf $PROFILE_NAME
+	;;
+	onscreen-keyboard)
+		set_common_motor
+		set_onscreen_keyboard
+		create_conf $PROFILE_NAME
+	;;
+esac
+
+if [ -n "$STARTUP_SCRIPT" ]; then
+	chmod 755 $CHROOT_DIR/usr/bin/a11y-profile-settings*
+fi
 
=== modified file 'bin/casper-preseed'
--- bin/casper-preseed	2006-10-16 15:05:58 +0000
+++ bin/casper-preseed	2011-10-06 10:04:28 +0000
@@ -2,18 +2,25 @@
 set -e
 PATH=/usr/sbin:/usr/bin:/sbin:/bin
 
+# Only do this once.
+if [ -z "$DEBCONF_REDIR" ]; then
+	exec <&4
+	export DEBIAN_HAS_FRONTEND=1
+	export DEBCONF_REDIR=1
+fi
+
 root="$1"
+. "$root/usr/share/debconf/confmodule"
+
 question="$2"
 value="$3"
 seen="$4"
 [ "$seen" ] || seen=true
 
-if ! (echo "SET $question $value"; echo "FSET $question seen $seen") | chroot "$1" debconf-communicate -fnoninteractive casper >/dev/null; then
-	chroot "$1" debconf-communicate -fnoninteractive casper >/dev/null <<EOF
-REGISTER debian-installer/dummy $question
-SET $question $value
-FSET $question seen $seen
-EOF
+if ! db_set "$question" "$value"; then
+	db_register debian-installer/dummy "$question"
+	db_set "$question" "$value"
 fi
+db_fset "$question" seen "$seen"
 
 exit 0
 
=== added file 'bin/casper-set-selections'
--- bin/casper-set-selections	1970-01-01 00:00:00 +0000
+++ bin/casper-set-selections	2011-10-06 10:04:28 +0000
@@ -0,0 +1,92 @@
+#!/bin/sh
+# Cloned-and-hacked from preseed/debconf-set-selections for casper.
+set -e
+
+OLDIFS="$IFS"
+CR=$(echo -en "\r")
+NL="
+"
+
+. /scripts/casper-functions
+load_confmodule
+
+# Returns the first field in the current line
+first_field() {
+	echo "$line" | grep -q "[[:space:]]" || return 1
+	echo "$line" | sed -r 's/^([^[:space:]]*).*/\1/'
+}
+
+# Returns any fields after the first field in the current line
+rest_line() {
+	if echo "$line" | grep -q "[[:space:]]"; then
+		echo "$line" | sed 's/^[^[:space:]]*[[:space:]]*//'
+	fi
+}
+
+SEEN=1
+if [ "$1" = --unseen ]; then
+	SEEN=
+	shift
+fi
+
+file="$1"
+
+parse_error() {
+	echo "Error parsing preconfiguration file: $*" >&2
+	exit 1
+}
+
+IFS="$NL"
+multiline=""
+# TODO: this squashes \r elsewhere in the line too
+for line in $(grep -v '^#\|^[[:space:]]*$' "$file" | sed "s/$CR//g"); do
+	IFS="$OLDIFS"
+	
+	line="$(echo "$line" | sed 's/^[[:space:]]*//')"
+	if echo "$line" | grep -q '\\$'; then
+		multiline="${multiline:+$multiline }$(echo "$line" | \
+			sed 's/[[:space:]]*\\$//')"
+		continue
+	elif [ -n "$multiline" ]; then
+		line="$multiline $line"
+		multiline=""
+	fi
+	
+	package=""
+	var=""
+	type=""
+	val=""
+	if ! package="$(first_field)"; then
+		parse_error "Syntax error: unable to determine template owner"
+	fi
+	line="$(rest_line)"
+	if ! var="$(first_field)"; then
+		parse_error "Syntax error: unable to determine template name"
+	fi
+	line="$(rest_line)"
+	if ! type="$(first_field)"; then
+		# Allow for lines without separator before an empty value
+		if [ "$line" ]; then
+			type="$line"
+		else
+			parse_error "Syntax error: unable to determine template type"
+		fi
+	fi
+	line="$(rest_line)"
+	val="$line"
+
+	if [ "$type" = seen ]; then
+		# Set seen flag.
+		db_fset "$var" "$type" "$val" || true # how to handle this error?
+	else
+		if ! db_set "$var" "$val"; then
+			# Question does not exist yet.
+			db_register debian-installer/dummy "$var"
+			db_set "$var" "$val"
+			db_subst "$var" ID "$var"
+		fi
+		if [ "$SEEN" ]; then
+			db_fset "$var" seen true
+		fi
+	fi
+done
 
=== modified file 'bin/casper-snapshot'
--- bin/casper-snapshot	2009-06-12 11:46:49 +0000
+++ bin/casper-snapshot	2011-10-06 10:04:28 +0000
@@ -215,7 +215,7 @@
 		fi
 	else
 		if [ -b "${dev}" ] ; then
-			try_mount "${dev}" "${MOUNTP}" rw
+			try_mount "${dev}" "${MOUNTP}" rw || panic "failed to mount ${dev}"
 		fi
 	fi
 }
 
=== added file 'bin/casper-update-initramfs'
--- bin/casper-update-initramfs	1970-01-01 00:00:00 +0000
+++ bin/casper-update-initramfs	2011-10-06 10:04:28 +0000
@@ -0,0 +1,25 @@
+#! /bin/sh
+set -e
+update-initramfs.distrib "$@"
+if [ -e /initrd.img ]; then
+    bootdir=
+else
+    bootdir=/boot
+fi
+# initrd.img may exist when vmlinuz doesn't; for example, if
+# update-initramfs is run on a fresh live USB stick without upgrading the
+# kernel.
+if [ -e "$bootdir/initrd.img" ]; then
+    if [ -e /cdrom/casper/initrd.lz ]; then
+        zcat "$bootdir/initrd.img" | lzma -9c >/cdrom/casper/initrd.lz.new
+        mv /cdrom/casper/initrd.lz.new /cdrom/casper/initrd.lz
+    else
+        cp "$bootdir/initrd.img" /cdrom/casper/initrd.gz.new
+        mv /cdrom/casper/initrd.gz.new /cdrom/casper/initrd.gz
+    fi
+fi
+if [ -e "$bootdir/vmlinuz" ]; then
+    cp "$bootdir/vmlinuz" /cdrom/casper/vmlinuz.new
+    mv /cdrom/casper/vmlinuz.new /cdrom/casper/vmlinuz
+fi
+exit 0
 
=== modified file 'casper-md5check/Makefile'
--- casper-md5check/Makefile	2009-01-30 11:27:37 +0000
+++ casper-md5check/Makefile	2011-10-06 10:04:28 +0000
@@ -1,6 +1,7 @@
 
 CC=gcc
-CFLAGS=$(getconf LFS_CFLAGS) -Wall -O2
+CFLAGS := $(shell getconf LFS_CFLAGS) -Wall -O2 -g $(shell pkg-config --cflags ply-boot-client)
+LDLIBS=$(shell pkg-config --libs ply-boot-client)
 
 casper-md5check: casper-md5check.c md5.c
 
 
=== modified file 'casper-md5check/casper-md5check.c'
--- casper-md5check/casper-md5check.c	2009-01-30 11:27:37 +0000
+++ casper-md5check/casper-md5check.c	2011-10-06 10:04:28 +0000
@@ -1,6 +1,7 @@
-/* casper-md5check - a tool to check md5sums and talk to usplash
-   (C) Canonical Ltd 2006
+/* casper-md5check - a tool to check md5sums and talk to plymouth
+   (C) Canonical Ltd 2006, 2010
    Written by Tollef Fog Heen <[e-mail]>
+   Ported to plymouth by Steve Langasek <[e-mail]>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -32,13 +33,17 @@
 #include <math.h>
 #include <termios.h>
 
-#define USPLASH_FIFO "/dev/.initramfs/usplash_fifo"
-#define MAXTRIES 5
+#include <ply-boot-client.h>
+#include <ply-event-loop.h>
+
 #include "md5.h"
 #define DEBUG
 
 static int verbose = 1;
-static int got_usplash = 0;
+static int got_plymouth = 0;
+static ply_event_loop_t *ply_event_loop = NULL;
+
+int set_nocanonical_tty(int fd);
 
 void parse_cmdline(void) {
   FILE *cmdline = fopen("/proc/cmdline", "r");
@@ -60,73 +65,54 @@
   fclose(cmdline);
 }
 
-int write_and_retry(int fd, char *s) {
-  int try = 0, ret = 0;
-  char *end;
-
-#ifdef DEBUG
-  fprintf(stderr, "-> %s\n", s);
-#endif
-
-  end = s + strlen(s)+1;
-
-  ret = write(fd, s, end - s);
-  while (s + ret < end && try < MAXTRIES) {
-    sleep(1);
-    s += ret;
-    ret = write(fd, s, strlen(s)+1);
-    try++;
-  }
-  return (s+ret == end ? 0 : 1);
-}
-
-void usplash_timeout(int fd, int timeout) {
+void plymouth_disconnected(void *user_data, ply_boot_client_t *client) {
+        printf("Disconnected from Plymouth\n");
+        got_plymouth = 0;
+	ply_event_loop_exit(ply_event_loop, 0);
+}
+
+void plymouth_answer(void *user_data, const char *keys,
+                     ply_boot_client_t *client)
+{
+	ply_event_loop_exit(ply_event_loop, 0);
+}
+
+void plymouth_response(void *user_data, ply_boot_client_t *client) {
+  /* No response */
+}
+
+void plymouth_failure(ply_boot_client_t *client, char *format, ...) {
   char *s;
-
-  if (!got_usplash)
-    return;
-
-  asprintf(&s, "TIMEOUT %d", timeout);
-
-  write_and_retry(fd, s);
-
-  free(s);
-}
-
-void usplash_failure(int fd, char *format, ...) {
-  char *s, *s1;
   va_list argp;
 
   va_start(argp, format);
   vasprintf(&s, format, argp);
   va_end(argp);
 
-  if (got_usplash) {
-    asprintf(&s1, "FAILURE %s", s);
-
-    write_and_retry(fd, s1);
-
-    free(s1);
+  if (got_plymouth) {
+    ply_boot_client_tell_daemon_to_display_message(client, s,
+                                                   plymouth_response,
+                                                   plymouth_response, NULL);
+    ply_event_loop_process_pending_events(ply_event_loop);
   } else if (verbose)
     printf("%s\n", s);
 
   free(s);
 }
 
-void usplash_text(int fd, char *format, ...) {
-  char *s, *s1;
+void plymouth_text(ply_boot_client_t *client, char *format, ...) {
+  char *s;
   va_list argp;
 
   va_start(argp, format);
   vasprintf(&s, format, argp);
   va_end(argp);
 
-  if (got_usplash) {
-    asprintf(&s1, "TEXT %s", s);
-
-    write_and_retry(fd, s1);
-
-    free(s1);
+  if (got_plymouth) {
+    ply_boot_client_tell_daemon_to_display_message(client, s,
+                                                   plymouth_response,
+                                                   plymouth_response, NULL);
+    ply_event_loop_process_pending_events(ply_event_loop);
   } else if (verbose) {
     printf("%s...", s);
     fflush(stdout);
@@ -135,7 +121,7 @@
   free(s);
 }
 
-void usplash_urgent(int fd, char *format, ...) {
+void plymouth_prompt(ply_boot_client_t *client, char *format, ...) {
   char *s, *s1;
   va_list argp;
 
@@ -143,12 +129,41 @@
   vasprintf(&s, format, argp);
   va_end(argp);
 
-  if (got_usplash) {
-    asprintf(&s1, "TEXT-URGENT %s", s);
-
-    write_and_retry(fd, s1);
-
-    free(s1);
+  if (got_plymouth) {
+    asprintf(&s1, "keys:%s", s);
+    ply_boot_client_tell_daemon_to_display_message(client, s1,
+                                                   plymouth_response,
+                                                   plymouth_response, NULL);
+
+    ply_boot_client_ask_daemon_to_watch_for_keystroke(client, NULL,
+                                                      plymouth_answer,
+                                                      (ply_boot_client_response_handler_t)plymouth_answer, NULL);
+    ply_event_loop_run(ply_event_loop);
+    ply_boot_client_attach_to_event_loop(client, ply_event_loop);
+    ply_boot_client_tell_daemon_to_quit(client, 1, plymouth_response,
+                                        plymouth_response, NULL);
+    ply_event_loop_run(ply_event_loop);
+  } else {
+    printf("%s\n", s);
+    set_nocanonical_tty(0);
+    getchar();
+  }
+  free(s);
+}
+
+void plymouth_urgent(ply_boot_client_t *client, char *format, ...) {
+  char *s;
+  va_list argp;
+
+  va_start(argp, format);
+  vasprintf(&s, format, argp);
+  va_end(argp);
+
+  if (got_plymouth) {
+    ply_boot_client_tell_daemon_to_display_message(client, s,
+                                                   plymouth_response,
+                                                   plymouth_response, NULL);
+    ply_event_loop_process_pending_events(ply_event_loop);
   } else
     printf("%s\n", s);
 
@@ -156,27 +171,26 @@
 }
 
 
-void usplash_success(int fd, char *format, ...) {
-  char *s, *s1;
+void plymouth_success(ply_boot_client_t *client, char *format, ...) {
+  char *s;
   va_list argp;
 
   va_start(argp, format);
   vasprintf(&s, format, argp);
   va_end(argp);
 
-  if (got_usplash) {
-    asprintf(&s1, "SUCCESS %s", s);
-
-    write_and_retry(fd, s1);
-    
-    free(s1);
+  if (got_plymouth) {
+    ply_boot_client_tell_daemon_to_display_message(client, s,
+                                                   plymouth_response,
+                                                   plymouth_response, NULL);
+    ply_event_loop_process_pending_events(ply_event_loop);
   } else if (verbose)
     printf("%s\n", s);
 
   free(s);
 }
 
-void usplash_progress(int fd, int progress) {
+void plymouth_progress(ply_boot_client_t *client, int progress) {
   static int prevprogress = -1;
   char *s;
 
@@ -184,11 +198,11 @@
     return;
   prevprogress = progress;
 
-  if (got_usplash) {
-    asprintf(&s, "PROGRESS %d", progress);
-
-    write_and_retry(fd, s);
-
+  if (got_plymouth) {
+    asprintf(&s, "md5check:verifying:%d", progress);
+    ply_boot_client_update_daemon(client, s, plymouth_response,
+                                  plymouth_response, NULL);
+    ply_event_loop_process_pending_events(ply_event_loop);
     free(s);
   } else {
     printf("%d%%...", progress);
@@ -210,7 +224,7 @@
 
 int main(int argc, char **argv) {
   
-  int pipe_fd, check_fd;
+  int check_fd;
   int failed = 0;
   
   FILE *md5_file;
@@ -219,6 +233,7 @@
   char hex_output[16*2 + 1];
   char *checksum, *checkfile;
   ssize_t tsize, csize;
+  ply_boot_client_t *client = NULL;
 
   tsize = 0;
   csize = 0;
@@ -236,18 +251,23 @@
   
   parse_cmdline();
 
-  pipe_fd = open(USPLASH_FIFO, O_WRONLY|O_NONBLOCK);
-  
-  if (pipe_fd == -1) {
+  client = ply_boot_client_new();
+  if (client)
+    ply_event_loop = ply_event_loop_new();
+  if (ply_event_loop)
+    ply_boot_client_attach_to_event_loop(client, ply_event_loop);
+
+  if (!client || !ply_event_loop || !ply_boot_client_connect(client, plymouth_disconnected, NULL))
+  {
     /* Fall back to text output */
-    perror("Opening pipe");
-    got_usplash = 0;
+    perror("Connecting to plymouth");
+    got_plymouth = 0;
   } else
-    got_usplash = 1;
-  
-
-  usplash_progress(pipe_fd, 0);
-  usplash_urgent(pipe_fd, "Checking integrity, this may take some time");
+    got_plymouth = 1;
+
+
+  plymouth_progress(client, 0);
+  plymouth_urgent(client, "Checking integrity, this may take some time");
   md5_file = fopen(argv[2], "r");
   if (!md5_file) {
           perror("fopen md5_file");
@@ -272,12 +292,11 @@
     
     md5_init(&state);
     
-    usplash_text(pipe_fd, "Checking %s", checkfile);
+    plymouth_text(client, "Checking %s", checkfile);
     
     check_fd = open(checkfile, O_RDONLY);
     if (check_fd < 0) {
-      usplash_timeout(pipe_fd, 300);
-      usplash_failure(pipe_fd, "%s", strerror(errno));
+      plymouth_failure(client, "%s: %s", checkfile, strerror(errno));
       sleep(10);
     }
     
@@ -285,7 +304,7 @@
 
     while (rsize > 0) {
       csize += rsize;
-      usplash_progress(pipe_fd, 100*((long double)csize)/tsize);
+      plymouth_progress(client, 100*((long double)csize)/tsize);
 
       md5_append(&state, (const md5_byte_t *)buf, rsize);
       rsize = read(check_fd, buf, sizeof(buf));
@@ -298,9 +317,9 @@
       sprintf(hex_output + i * 2, "%02x", digest[i]);
     
     if (strncmp(hex_output, checksum, strlen(hex_output)) == 0) {
-      usplash_success(pipe_fd, "OK");
+      plymouth_success(client, "%s: OK", checkfile);
     } else {
-      usplash_failure(pipe_fd, "mismatch");
+      plymouth_failure(client, "%s: mismatch", checkfile);
       failed++;
     }
     free(checksum);
@@ -308,14 +327,13 @@
   }
   fclose(md5_file);
   if (failed) {
-    usplash_urgent(pipe_fd, "Check finished: errors found in %d files!", failed);
+    plymouth_urgent(client, "Check finished: errors found in %d files!", failed);
   } else {
-    usplash_urgent(pipe_fd, "Check finished: no errors found");
+    plymouth_urgent(client, "Check finished: no errors found");
   }
-  usplash_urgent(pipe_fd, "Press any key to reboot your system");
-  usplash_timeout(pipe_fd, 86400);
-  set_nocanonical_tty(0);
-  getchar();
+
+  plymouth_prompt(client, "Press any key to reboot your system");
+
   reboot(LINUX_REBOOT_CMD_RESTART);
   return 0;
   
 
=== modified file 'conf.d/compcache'
--- conf.d/compcache	2008-09-12 08:13:38 +0000
+++ conf.d/compcache	2011-10-06 10:04:28 +0000
@@ -1,1 +1,1 @@
-COMPCACHE_SIZE="25%"
+COMPCACHE_SIZE="50%"
 
=== modified file 'debian/casper.init'
--- debian/casper.init	2009-10-09 14:59:34 +0000
+++ debian/casper.init	2011-10-06 10:04:28 +0000
@@ -46,7 +46,7 @@
         find "$path" -type f | xargs cat > /dev/null 2>&1
     elif [ -f "$path" ]; then
         if [ -x "$path" ]; then
-            if file "$path" | grep -q 'dynamically linked'; then
+            if file -L "$path" | grep -q 'dynamically linked'; then
                 for lib in $(ldd "$path" | awk '{ print $3 }'); do
                     cache_path "$lib"
                 done
@@ -89,7 +89,7 @@
 	prompt=
     fi
 
-    for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty); do
+    for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty) /bin/plymouth /sbin/usplash_write; do
         cache_path "$path"
     done
 
@@ -97,17 +97,23 @@
 
     [ "$prompt" ] || return 0
 
-    stty sane < /dev/console
-
     # XXX - i18n
-    echo "Please remove the disc and close the tray (if any) then press ENTER: " > /dev/console
-    if [ -x /sbin/usplash_write ]; then
-        /sbin/usplash_write "TIMEOUT 86400"
-        /sbin/usplash_write "TEXT-URGENT Please remove the disc, close the tray (if any)"
-        /sbin/usplash_write "TEXT-URGENT and press ENTER to continue"
+    MSG="Please remove installation media and close the tray (if any) then press ENTER: "
+
+    if [ -x /bin/plymouth ] && plymouth --ping; then
+        plymouth message --text="$MSG"
+        plymouth watch-keystroke > /dev/null
+    else
+        stty sane < /dev/console
+
+        echo $MSG > /dev/console
+        if [ -x /sbin/usplash_write ]; then
+            /sbin/usplash_write "TIMEOUT 86400"
+            /sbin/usplash_write "TEXT-URGENT Please remove installation media, close the tray"
+            /sbin/usplash_write "TEXT-URGENT (if any) and press ENTER to continue"
+        fi
+        read x < /dev/console
     fi
-
-    read x < /dev/console
 }
 
 case "$1" in
 
=== modified file 'debian/casper.install'
--- debian/casper.install	2009-09-23 14:21:43 +0000
+++ debian/casper.install	2011-10-06 10:04:28 +0000
@@ -1,9 +1,12 @@
+bin/casper-a11y-enable		usr/bin
 bin/casper-getty		sbin
 bin/casper-login		sbin
 bin/casper-new-uuid		sbin
 bin/casper-preseed		usr/share/casper
 bin/casper-reconfigure		usr/share/casper
+bin/casper-set-selections	usr/share/casper
 bin/casper-snapshot		sbin
+bin/casper-update-initramfs	usr/share/casper
 hooks				usr/share/initramfs-tools
 scripts				usr/share/initramfs-tools
 conf.d				usr/share/initramfs-tools
 
=== modified file 'debian/casper.postinst'
--- debian/casper.postinst	2006-07-21 11:19:15 +0000
+++ debian/casper.postinst	2011-10-06 10:04:28 +0000
@@ -1,5 +1,15 @@
 #! /bin/sh
 
+# If running from writable media, make sure that update-initramfs is
+# properly a symlink.
+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 1.253 && \
+   [ -w /cdrom ] && [ -e /usr/sbin/update-initramfs.distrib ] && \
+   [ ! -L /usr/sbin/update-initramfs ] && \
+   fgrep -qs update-initramfs.distrib /usr/sbin/update-initramfs; then
+    ln -nsf /usr/share/casper/casper-update-initramfs \
+            /usr/sbin/update-initramfs
+fi
+
 update-initramfs -u
 
 #DEBHELPER#
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-09-28 23:07:27 +0000
+++ debian/changelog	2011-10-06 10:04:28 +0000
@@ -1,4 +1,732 @@
-casper (1.211) UNRELEASED; urgency=low
+casper (1.285) UNRELEASED; urgency=low
+
+  * scripts/casper:
+    - enable use of virtio devices in is_nice_device()
+
+ -- Ante Karamatic <[e-mail]>  Thu, 06 Oct 2011 05:29:13 -0400
+
+casper (1.284) oneiric; urgency=low
+
+  * bin/casper-a11y-enable:
+    - Set the session by calling AccountService via dbus instead of using
+      lightdm commands, as we cannot run lightdm-set-defaults as a user
+    - Add some extra spaces to make sure the startup scripts used to set a11y
+      settings are syntactically correct
+    - Add some other needed settings for various profiles for use in the login
+      manager
+    - Set correct permissions for the orca config directory once the config
+      files have been created
+    - Make sure the startup script checks take into account the ability to be
+      run from the initramfs
+  * ubiquity-hooks/30accessibility:
+    - Make sure that accessibility profile settings are properly applied at
+      install time, even if the user decided to try Ubuntu first, and then
+      run the install from the desktop
+    - Copy any existing orca configuration to the target system
+    - Make sure profile settings are not set up twice
+
+ -- Luke Yelavich <[e-mail]>  Wed, 14 Sep 2011 16:19:59 +1000
+
+casper (1.283) oneiric; urgency=low
+
+  * scripts/casper-bottom/22screensaver: Set gsettings key instead of gconf.
+  * scripts/casper-bottom/44pk_allow_ubuntu: Drop old PolicyKit stuff, it's
+    gone for a long time.
+  * Drop scripts/casper-bottom/45disable_guest_account: We are not using gdm
+    any more, and lightdm implements that differently.
+  * Drop scripts/casper-bottom/47une_ubiquity, UNE/netbook-launcher are
+    history.
+  * Add scripts/casper-bottom/26disable_user_menu: Disable the user indicator
+    menu. (LP: #834137)
+
+ -- Martin Pitt <[e-mail]>  Wed, 07 Sep 2011 12:33:57 +0200
+
+casper (1.282) oneiric; urgency=low
+
+  * bin/casper-a11y-enable: Fix typo/syntax error in the set_session function
+
+ -- Luke Yelavich <[e-mail]>  Wed, 07 Sep 2011 15:20:05 +1000
+
+casper (1.281) oneiric; urgency=low
+
+  * bin/casper-a11y-enable:
+    - Change all remaining references of gdm to lightdm, particularly in the
+      usage help text, and the username of the login manager
+    - Set the default login session to ubuntu-2d for screen reader and braille
+      profiles
+
+ -- Luke Yelavich <[e-mail]>  Mon, 05 Sep 2011 15:02:31 +1000
+
+casper (1.280) oneiric; urgency=low
+
+  * Don't fail to set up autologin on a commented out autologin-user line
+    in lightdm custom conf. (LP: #836727)
+
+ -- Mario Limonciello <[e-mail]>  Mon, 29 Aug 2011 09:16:00 -0500
+
+casper (1.279) oneiric; urgency=low
+
+  * hooks/casper: pull in overlayfs kernel module to allow use of overlayfs
+    as the union mount during install.
+
+ -- Andy Whitcroft <[e-mail]>  Fri, 19 Aug 2011 13:03:27 +0100
+
+casper (1.278) oneiric; urgency=low
+
+  * scripts/casper-bottom/15autologin:
+    - handling lightdm.conf in the case we already have a configuration file (to
+      avoid overwriting it on the cd if we don't have the default gtk greeter
+      installed if greeter not specified). Flavors should now use
+      set-lightdm-defaults to set the default session and greeter, even if
+      this still works with current alternatives method.
+
+ -- Didier Roche <[e-mail]>  Thu, 11 Aug 2011 09:05:43 +0200
+
+casper (1.277) oneiric; urgency=low
+
+  * Add an extra command-line argument to casper-a11y-helper which will
+    create a startup script that will be executed either on first boot after
+    install, or once we switch out of the initramfs to boot the live
+    session. This is needed to work around gsettings not working when
+    chrooting to the target environment with no dbus running.
+  * Add extra checks to the ubiquity accessibility target-config hook to
+    determine whether accessibility was enabled during the running of
+    ubiquity, and act accordingly.
+  * Call the casper a11y helper script with the newly added -script argument
+    as per above.
+  * Determine whether we are root by checking the $HOME variable.
+  * Do not call the a11y profile script in debug mode
+
+ -- Luke Yelavich <[e-mail]>  Fri, 05 Aug 2011 15:22:27 +1000
+
+casper (1.276) oneiric; urgency=low
+
+  * If lightdm.conf exists, remove it first to avoid issues with symlinks.
+
+ -- Stéphane Graber <[e-mail]>  Thu, 04 Aug 2011 12:26:08 -0400
+
+casper (1.275) oneiric; urgency=low
+
+  * Update 15autologin to overwrite any existing lightdm configuration.
+    This should fix lightdm autologin for everyone.
+    Any custom lightdm configuration won't apply to the live environment.
+
+ -- Stéphane Graber <[e-mail]>  Wed, 03 Aug 2011 10:10:48 -0400
+
+casper (1.274) oneiric; urgency=low
+
+  * Remove log_end_message call (LP: #820284).
+
+ -- Evan Dandrea <[e-mail]>  Wed, 03 Aug 2011 12:01:57 +0100
+
+casper (1.273) oneiric; urgency=low
+
+  [ Mario Limonciello ]
+  * scripts/casper: Add support for SAS controllers now that 575297 is fixed.
+    (LP: #819564)
+
+  [ Stéphane Graber ]
+  * lightdm no longer ships with /etc/lightdm/lightdm.conf in its package.
+    Updating 15autologin casper hook to create one when missing. (LP: #819609)
+
+ -- Stéphane Graber <[e-mail]>  Tue, 02 Aug 2011 17:47:10 -0400
+
+casper (1.272) oneiric; urgency=low
+
+  [ Andy Whitcroft ]
+  * scripts/casper: add support for overlayfs for union mounts of the liveCD
+
+  [ Luke Yelavich ]
+  * Port the rest of the accessibility profile settings to gsettings, except
+    where gconf settings are required, eg firefox and gksu
+  * bin/casper-a11y-enable: Extract the username from the $HOME environment
+    variable, as $USER is not set when ubiquity calls the script, even with
+    all privileges dropped
+
+ -- Luke Yelavich <[e-mail]>  Wed, 27 Jul 2011 15:20:11 +1000
+
+casper (1.271) oneiric; urgency=low
+
+  * bin/casper-a11y-enable:
+    - Use -x when enabling debug mode
+    - Adjust some variable quoting when checking for package versions
+    - Do not break out of the command-line checking loop at all, let it run its
+      course until there are no command-line values left to parse
+
+ -- Luke Yelavich <[e-mail]>  Fri, 01 Jul 2011 11:47:31 +0100
+
+casper (1.270) oneiric; urgency=low
+
+  * Depend on lzma for our diverted update-initramfs (LP: #790794).
+
+ -- Colin Watson <[e-mail]>  Thu, 30 Jun 2011 10:30:49 +0100
+
+casper (1.269) oneiric; urgency=low
+
+  [ Luke Yelavich ]
+  * bin/casper-a11y-helper:
+    - Migrate blindness and braille accessibility profiles to gsettings for
+      all except gksu, which still uses gconf to store settings.
+
+  [ Colin Watson ]
+  * Add LightDM autologin support (LP: #797669).
+
+ -- Colin Watson <[e-mail]>  Fri, 17 Jun 2011 12:52:44 +0100
+
+casper (1.268) oneiric; urgency=low
+
+  The big accessibility profile code refactor:
+  * debian/copyright: Update Canonical copyright years to include 2011
+  * bin/casper-a11y-helper: Create a new script that will be callable from
+    casper/the initramfs, ubiquity at the maybe-ubiquity screen, and ubiquity
+    when running through ubiquity-hooks during the installation process.
+    - Copy accessibility profile settings from both
+      scripts/casper-bottom/30accessibility and ubiquity-hooks/30accessibility
+    - Refactor profile settings into groups of common settings for low vision
+      and motor profiles, with the rest of the settings broken up into
+      individual methods for each profile
+    - Add options to allow for calling the script from within the initramfs
+    - Do a few more package checks to make sure the target environment has the
+      commands we need to set things up
+  * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
+    - Remove old profile settings and support code, and make use of the new
+      a11y helper script
+    - Call the helper with debugging enabled for now, to help with testing
+      to make sure the new helper is executing properly
+  * debian/casper.install: Add casper-a11y-helper
+ 
+ -- Luke Yelavich <[e-mail]>  Wed, 08 Jun 2011 15:35:39 +1000
+
+casper (1.267) oneiric; urgency=low
+
+  * scripts/casper-bottom/32disable_hibernation: Drop obsolete
+    gnome-power-manager and kde-profile configuration, and just globally
+    disable hibernation via policykit. (LP: #610351)
+
+ -- Martin Pitt <[e-mail]>  Wed, 08 Jun 2011 07:25:43 +0200
+
+casper (1.266) oneiric; urgency=low
+
+  * Disable release-upgrade prompts in the live session (LP: #777759).
+
+ -- Colin Watson <[e-mail]>  Thu, 05 May 2011 12:28:33 +0100
+
+casper (1.265) natty; urgency=low
+
+  * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
+    - Use gsettings to adjust yelp caret navigation, as properly fixed in
+      yelp 3.0.1
+  * ubiquity-hooks/30accessibility: Fix the gset function to set settings for
+    the target username, and not the username of the live user
+
+ -- Luke Yelavich <[e-mail]>  Mon, 11 Apr 2011 16:47:46 +1000
+
+casper (1.264) natty; urgency=low
+
+  * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
+    - Enable yelp carrot navigation by default in the moderate visual
+      impairment, blindness, and Braille profiles, thanks to Attila Hammer
+      for the patch (LP: #752503)
+
+ -- Luke Yelavich <[e-mail]>  Thu, 07 Apr 2011 10:17:52 +1000
+
+casper (1.263) natty; urgency=low
+
+  [ Evan Dandrea ]
+  * Suppress Log Out item in the live session (LP: #750140).
+
+  [ Martin Pitt ]
+  * scripts/casper-helpers, find_cow_device(): Do not ever probe floppy
+    devices. There are lots of computers which still have a floppy controller
+    (and thus a /dev/fd0), but no actual floppy. Trying to send anything to
+    /dev/fd0 will result in very long timeouts. Here this causes booting the
+    live CD to take more than 30 minutes. (See also LP #539515 for the
+    corresponding bug in udev/udisks). (LP: #739774)
+
+ -- Martin Pitt <[e-mail]>  Mon, 04 Apr 2011 16:12:34 +0200
+
+casper (1.262) natty; urgency=low
+
+  * scripts/casper-bottom/30accessibility:
+    - Don't blindly assume that there are no orca config files/directories in
+      the created user's home directory. A derivative may have placed something
+      in /etc/skel as part of the live filesystem, and we shouldn't be
+      clobbering it, thanks to Attila Hammer for the pointer (LP: #744227)
+
+ -- Luke Yelavich <[e-mail]>  Mon, 04 Apr 2011 17:32:40 +1000
+
+casper (1.261) natty; urgency=low
+
+  * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
+    - Also use classic GNOME for the "motor difficulties, pointing devices"
+      profile, due to issues with on-screen keyboards and unity search
+
+ -- Luke Yelavich <[e-mail]>  Mon, 04 Apr 2011 16:15:59 +1000
+
+casper (1.260) natty; urgency=low
+
+  [ Colin Watson ]
+  * Force apt-cdrom's mount point to /cdrom (LP: #723357).  I've left the
+    /media/cdrom symlink introduced in 1.259 in place anyway, as it's
+    harmless on the live CD and may save some effort elsewhere.
+
+  [ Luke Yelavich ]
+  * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
+    - Set the default session to classic GNOME for moderate visual
+      impairement, blindness, and braille accessibility profiles (LP: #734659)
+    - Fix a few dangling references to user-settings.py (LP: #744214)
+    - Don't set /desktop/gnome/accessibility/keyboard/enable for vision
+      related profiles (LP: #711131)
+
+ -- Luke Yelavich <[e-mail]>  Fri, 01 Apr 2011 16:13:07 +1100
+
+casper (1.259) natty; urgency=low
+
+  * scripts/casper-bottom/05mountpoints: Create a /media/cdrom -> /cdrom
+    symlink, to work around apt's changed default mount point for Alpha-3.
+    (LP: #727783)
+
+ -- Martin Pitt <[e-mail]>  Thu, 03 Mar 2011 11:52:38 +0100
+
+casper (1.258) natty; urgency=low
+
+  * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
+    - Remove code that removes applets from the panel. Indicators are the
+      way forward, and we have unity, which works differently.
+    - Write orca configuration in json format
+    - Set some settings in gsettings parallel to gconf, next cycle there
+      will be a full migration to gsettings.
+    - Do not change the default window manager setting, this will be done
+      according to what is detected with unity/compiz et al.
+
+ -- Luke Yelavich <[e-mail]>  Wed, 23 Feb 2011 15:18:23 +1100
+
+casper (1.257) natty; urgency=low
+
+  * Handle $cow_backing already being mounted elsewhere (LP: #683260).
+
+ -- Evan Dandrea <[e-mail]>  Fri, 11 Feb 2011 16:41:11 +0000
+
+casper (1.256) natty; urgency=low
+
+  * Add scripts/casper-bottom/49kubuntu_mobile_session to run Kubuntu
+    mobile session
+
+ -- Jonathan Riddell <[e-mail]>  Thu, 10 Feb 2011 17:42:34 +0000
+
+casper (1.255) natty; urgency=low
+
+  [ Evan Dandrea ]
+  * Don't disable the free space notifier if using persistent storage.
+
+  [ Daniel Manrique ]
+  * scripts/casper-bottom/23networking: Strip quotes from DNSDOMAIN as
+    returned by ipconfig, and sanitize the domain entry to ensure the
+    generated /etc/resolv.conf is formatted correctly (LP: #709364).
+
+ -- Colin Watson <[e-mail]>  Tue, 01 Feb 2011 11:05:13 +0000
+
+casper (1.254) natty; urgency=low
+
+  * More fixes to the USB update-initramfs shim (LP: #591207):
+    - Make the shim a proper executable in
+      /usr/share/casper/casper-update-initramfs and symlink to it if
+      necessary at boot time, so that new versions of this shim are
+      automatically installed when casper is upgraded.
+    - $bootdir/initrd.img may exist when $bootdir/vmlinuz doesn't; for
+      example, if we're running off a fresh live USB stick and the kernel
+      hasn't yet been upgraded.
+
+ -- Colin Watson <[e-mail]>  Thu, 20 Jan 2011 14:18:59 +0000
+
+casper (1.253) natty; urgency=low
+
+  * Don't try to process the initramfs and kernel if the real update-
+    initramfs hasn't generated anything (LP: #557023).
+
+ -- Evan Dandrea <[e-mail]>  Wed, 05 Jan 2011 12:07:47 +0000
+
+casper (1.252) natty; urgency=low
+
+  * Cope with forthcoming console-setup changes: handle
+    /etc/default/keyboard if present, and in that case preseed
+    keyboard-configuration/* templates.
+
+ -- Colin Watson <[e-mail]>  Tue, 21 Dec 2010 16:44:54 +0000
+
+casper (1.251) natty; urgency=low
+
+  * scripts/casper-bottom/44pk_allow_ubuntu: Tweak the default PolicyKit
+    policy to avoid dropping wireless connections when a user switches to
+    another VT (LP: #656757)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Sat, 04 Dec 2010 13:11:23 +0000
+
+casper (1.250) natty; urgency=low
+
+  * Use LDLIBS rather than LDFLAGS for 'pkg-config --libs ply-boot-client',
+    fixing link line ordering.
+
+ -- Colin Watson <[e-mail]>  Mon, 29 Nov 2010 13:28:17 +0000
+
+casper (1.249) natty; urgency=low
+
+  [ arky ]
+  * Add universal access preferences taskbar icon in all accessibility
+    profiles (LP: #621561).
+
+  [ Serge Hallyn ]
+  * change scripts/casper-helpers:try_mount() to not panic when regular
+    mounts fail.  Instead, return an error code so the caller can decide.
+    (LP: #624632)
+
+  [ Evan Broder ]
+  * scripts/casper: Check for uuid= command line parameter in addition to
+    /conf/uuid.conf file in initrd. (LP: #671786)
+
+  [ Colin Watson ]
+  * Document new uuid= option in casper(7).
+
+ -- Colin Watson <[e-mail]>  Mon, 29 Nov 2010 12:49:36 +0000
+
+casper (1.248) maverick; urgency=low
+
+  * ubiquity-hooks/30accessibility: Create .local/share subdirectory structure
+    before copying files. Also copy orca files to ~/.local/share, instead
+    ~/. Thanks to Attila Hammer for the patch. (LP: #650846)
+
+ -- Luke Yelavich <[e-mail]>  Tue, 05 Oct 2010 15:35:35 +1100
+
+casper (1.247) maverick; urgency=low
+
+  * Check for the existance of a kubuntu-default-settings directory before
+    running scripts/casper-bottom/48kubuntu_disable_restart_notifications
+
+ -- Jonathan Thomas <[e-mail]>  Mon, 04 Oct 2010 17:43:21 -0400
+
+casper (1.246) maverick; urgency=low
+
+    * Added scripts/casper-bottom/07remove_oem_config
+    - Added new script to remove oem-config if installed on the image on ARM,
+      as it should never be installed on a non-preinstalled image. This is 
+      necessary because we can't exclude oem-config on the seed on a 
+      per-subarchitecture basis
+  * scripts/casper/47une_ubiquity
+    - Cause gconf changes to be made to both the 2D & 3D UNE launchers so 
+      ubiquity properly shows up in favorites regardless of which launcher is
+      used (LP: #643791)
+
+ -- Michael Casadevall <[e-mail]>  Mon, 27 Sep 2010 17:52:50 -0400
+
+casper (1.245) maverick; urgency=low
+
+  * Add scripts/casper-bottom/49disable_kubuntu_restart_notify for a more
+    surgical solution at disabling restart notifications on the Live CD
+  * Don't remove the notificationhelper.desktop file in 34disable_kde_services
+
+ -- Jonathan Thomas <[e-mail]>  Tue, 28 Sep 2010 19:20:26 -0400
+
+casper (1.244) maverick; urgency=low
+
+  * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
+    - Use orca's new settings location in ~/.local/share, as orca is now
+      more XDG compliant
+
+ -- Luke Yelavich <[e-mail]>  Thu, 16 Sep 2010 09:38:21 +1000
+
+casper (1.243) maverick; urgency=low
+
+  * Backport from live-initramfs 1.154.6-1:
+    - Adding patch from Thierry Walrant <[e-mail]> to allow
+      setting a path for the persistence files through persistent-path boot
+      parameter (Closes: #512661).
+  * Follow symlinks when checking for dynamically linked files at reboot.
+
+ -- Colin Watson <[e-mail]>  Tue, 07 Sep 2010 10:53:32 +0100
+
+casper (1.242) maverick; urgency=low
+
+  * Update scripts/casper-bottom/34disable_kde_services to stop some new
+    akonadi services
+
+ -- Jonathan Riddell <[e-mail]>  Mon, 06 Sep 2010 14:20:54 +0100
+
+casper (1.241) maverick; urgency=low
+
+  [ Mathieu Trudel-Lapierre ]
+  * Use configure_networking at do_netmount; it's at least more resilient
+    than a simple ipconfig call since it retries, and it properly parses
+    BOOTIF to know which devices to configure. (LP: #602273)
+
+  [ Colin Watson ]
+  * Parse the machine-readable file written out by ipconfig rather than
+    trying to parse its human-readable output.
+
+ -- Colin Watson <[e-mail]>  Fri, 20 Aug 2010 13:37:56 +0100
+
+casper (1.240) maverick; urgency=high
+
+  * scripts/casper
+    - Added platform-sata_mv to is_nice_device() to allow Marvell
+      Dove A0 and AVD1 to properly boot live media (LP: #618489)
+
+ -- Michael Casadevall <[e-mail]>  Mon, 16 Aug 2010 19:36:56 +0800
+
+casper (1.239) maverick; urgency=low
+
+  * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
+    - Instead of mangling the main sudoers file, create a new file in
+      /etc/sudoers.d and set permissions appropriately
+
+ -- Luke Yelavich <[e-mail]>  Wed, 11 Aug 2010 13:46:03 +1000
+
+casper (1.238) maverick; urgency=low
+
+  [ Alex Chiang ]
+  * Disable ureadahead-other job as well as ureadahead (LP: #605695).
+
+ -- Colin Watson <[e-mail]>  Thu, 15 Jul 2010 11:49:36 +0100
+
+casper (1.237) maverick; urgency=low
+
+  [ Colin Watson ]
+  * Add btrfs support.
+  * Make ip=* command-line parsing more precise (thanks, Bill Nickless;
+    LP: #586553).
+  * Make the USB update-initramfs shim cope with vmlinuz and initrd.img
+    being in /boot rather than / (LP: #591207).
+  * Depend on file for /etc/init.d/casper (thanks, Alon Swartz;
+    LP: #591213).
+  * Conflict with live-initramfs, as they overlap and people can pick one or
+    the other (LP: #453476).
+
+  [ Martin Pitt ]
+  * debian/casper.init: Change shutdown splash message to refer to
+    "installation media" instead of "disc"; a lot of installs happen
+    from USB sticks these days. Thanks to Debbie Beliveau for the idea.
+
+ -- Colin Watson <[e-mail]>  Mon, 28 Jun 2010 16:53:17 +0100
+
+casper (1.236) lucid; urgency=low
+
+  * Check for LTS in the release name (LP: #558488).
+
+ -- Evan Dandrea <[e-mail]>  Wed, 21 Apr 2010 11:12:32 +0100
+
+casper (1.235) lucid; urgency=low
+
+  * Unbreak early command from previous commit.
+
+ -- Mario Limonciello <[e-mail]>  Thu, 15 Apr 2010 02:54:15 -0500
+
+casper (1.234) lucid; urgency=low
+
+  * Only bring the network up while running preseed/early_command if
+    preseed/allow-network=true.
+
+ -- Colin Watson <[e-mail]>  Wed, 14 Apr 2010 15:56:40 +0100
+
+casper (1.233) lucid; urgency=low
+
+  * Bring the network up while running preseed/early_command.
+  * Fix use of debconf passthrough frontend; DEBCONF_READFD and
+    DEBCONF_WRITEFD were backwards, and DEBIAN_HAS_FRONTEND and
+    DEBCONF_REDIR needed to be unset or else confmodule scripts would end up
+    trying to talk to closed file descriptors.
+  * Run debconf-communicate with a read-only template database and separate
+    config databases, and copy any changed values back to the master
+    databases at the end.  This allows us to use the noninteractive frontend
+    rather than passthrough when running apt-get in preseed/early_command or
+    dpkg to install driver updates, thereby ensuring that the template
+    database is properly initialised (LP: #557011).
+
+ -- Colin Watson <[e-mail]>  Mon, 12 Apr 2010 23:41:09 +0100
+
+casper (1.232) lucid; urgency=low
+
+  * bump compcache size to 50% on live images for machines with less than
+    512MiB. This makes sure we don't hit OOM errors on systems with only
+    256MiB of RAM.
+
+ -- Oliver Grawert <[e-mail]>  Mon, 12 Apr 2010 08:10:06 +0200
+
+casper (1.231) lucid; urgency=low
+
+  [ Jonathan Riddell ]
+  * Remove 37kubuntu_netbook_installer_link, now done with a patch in
+    kdebase-workspace
+
+  [ Colin Watson ]
+  * If copying live media to RAM or disk, explicitly copy .disk, since *
+    won't expand to include it (LP: #526305).
+  * Cache /bin/plymouth and /sbin/usplash_write before ejecting the CD, in
+    the hope that that helps with I/O errors on reboot (see LP #539027).
+
+  [ Luke Yelavich ]
+  * ubiquity-hooks/30accessibility: Copy the orca settings directory to the
+    gdm home directory, to allow for preferred orca settings to be used in
+    gdm (LP: #551515).
+
+ -- Luke Yelavich <[e-mail]>  Fri, 09 Apr 2010 14:00:51 +1000
+
+casper (1.230) lucid; urgency=low
+
+  * Don't save the hardware clock on live CD reboot; we used to do this in
+    the sysvinit world, but it regressed when we switched to Upstart
+    (thanks, Norm Pierce; LP: #436535).
+  * When running update-initramfs on writable media, update initrd.lz rather
+    than initrd.gz if it's present, and make the update process a bit safer
+    while we're there (LP: #489736).
+  * Handle toram and todisk=DEVICE options on command line (LP: #526305).
+  * Policy version 3.8.4: no changes required.
+  * Convert to source format 3.0 (native).
+
+ -- Colin Watson <[e-mail]>  Tue, 30 Mar 2010 11:41:24 +0100
+
+casper (1.229) lucid; urgency=low
+
+  [ Jonathan Riddell ]
+  * Update scripts/casper-bottom/34disable_kde_services for lucid
+
+  [ Evan Dandrea ]
+  * Don't let apt try to auto-detect the CD-ROM device using udev.  We
+    already know what it is, and using udev to find it again wont work
+    for USB disks.
+
+ -- Evan Dandrea <[e-mail]>  Tue, 23 Mar 2010 11:42:00 +0000
+
+casper (1.228) lucid; urgency=low
+
+  * Update for the new libplymouth2.
+
+ -- Steve Langasek <[e-mail]>  Fri, 12 Mar 2010 18:37:02 -0800
+
+casper (1.227) lucid; urgency=low
+
+  * casper-md5check: port from usplash to plymouth.  LP: #500198
+  * fix up our reliance on usplash, /dev/console elsewhere.  LP: #506418.
+
+ -- Steve Langasek <[e-mail]>  Fri, 12 Mar 2010 01:12:28 -0800
+
+casper (1.226) lucid; urgency=low
+
+  [ Colin Watson ]
+  * Stop using removed nfsro option for NFS/unionfs (thanks, Bernhard
+    Seibold; LP: #460781).
+
+  [ Jonathan Riddell ]
+  * Remove scripts/casper-bottom/48enable_kubuntu_netbook and ubiquity-
+    hooks/48enable_kubuntu_netbook now enabled in kubuntu-netbook-
+    default-settings
+
+ -- Jonathan Riddell <[e-mail]>  Wed, 10 Mar 2010 22:23:04 +0000
+
+casper (1.225) lucid; urgency=low
+
+  * Add ubiquity-hooks/49kubuntu_gnome_icon_cache to recreate the Gnome
+    icon cache on Kubuntu CDs, removed by livecd-rootfs
+
+ -- Jonathan Riddell <[e-mail]>  Mon, 08 Mar 2010 11:47:01 +0000
+
+casper (1.224) lucid; urgency=low
+
+  * Remove ubiquity-hooks/35copy_wallpaper_cache as now implement it in
+    ubiquity itself (LP: #530024)
+
+ -- Didier Roche <[e-mail]>  Mon, 01 Mar 2010 19:41:45 +0100
+
+casper (1.223) lucid; urgency=low
+
+  * Bind-mount /dev, /proc, and /sys into /root while running apt-cdrom.
+  * Copy /lib/udev/rules.d/60-cdrom_id.rules into the initramfs to go with
+    /lib/udev/cdrom_id, so that apt-cdrom will be able to find ID_CDROM=1
+    entries when we run it.  This should stop update-notifier from
+    repeatedly popping up during the live session.
+
+ -- Colin Watson <[e-mail]>  Tue, 23 Feb 2010 01:35:30 +0000
+
+casper (1.222) lucid; urgency=low
+
+  * scripts/casper-bottom/47une_ubiquity:
+    - get back ubiquity favorite icon in UNE live (LP: #524381)
+    - rename the script from 47unr_ubiquity to 47une_ubiquity as well
+      as "UNR" mention
+
+ -- Didier Roche <[e-mail]>  Mon, 22 Feb 2010 14:01:25 +0100
+
+casper (1.221) lucid; urgency=low
+
+  * Remove the rest of the mythbuntu delta from 10adduser.  It will be
+    maintained in the mythbuntu-live-autostart package instead so that
+    users from ~mythbuntu-dev can administer it.
+
+ -- Mario Limonciello <[e-mail]>  Sun, 21 Feb 2010 20:22:00 -0600
+
+casper (1.220) lucid; urgency=low
+
+  * scripts/casper: calculate memory without "head" utility, thanks to
+    Petar Bogdanovic (LP: #25496).
+
+ -- Kees Cook <[e-mail]>  Fri, 19 Feb 2010 14:04:18 -0800
+
+casper (1.219) lucid; urgency=low
+
+  [ Mario Limonciello ]
+  * Disable casper-reconfigure from 22gnome_panel_data.  It doesn't (appear) to
+    serve a functional purpose as the postinst does nothing different for laptops.
+
+  [ Didier Roche ]
+  * add 35copy_wallpaper_cache to copy the wallpaper cache created at boot time
+    to the main user's directory. First boot will take it into account in
+    ureadahead profiling
+
+ -- Didier Roche <[e-mail]>  Wed, 17 Feb 2010 19:14:53 +0100
+
+casper (1.218) lucid; urgency=low
+
+  * Allow dpkg and apt-get to be installed from within commands that operate
+    in the chroot via early_command or driver updates. (LP: #521218)
+
+ -- Mario Limonciello <[e-mail]>  Tue, 16 Feb 2010 13:38:48 -0600
+
+casper (1.217) lucid; urgency=low
+
+  [ Luke Yelavich ]
+  * ubiquity-hooks/30accessibility: Enable accessible login for the blindness
+    and braile accessibility profiles.
+
+  [ Colin Watson ]
+  * Use egrep rather than 'grep -E' (LP: #512386).
+
+  [ Julien Lavergne ]
+  * 15autologin: Add support for LXDM autologin (LP: #511976).
+
+  [ Evan Dandrea ]
+  * Properly shut down debconf-communicate so that its database gets
+    written (LP: #518272).
+
+ -- Evan Dandrea <[e-mail]>  Thu, 11 Feb 2010 08:25:53 +0000
+
+casper (1.216) lucid; urgency=low
+
+  [ Luke Yelavich ]
+  * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
+    - Remove code to disable pulseaudio, as it is no longer needed, and
+      the supporting code in the pulseaudio package was removed a long time
+      ago.
+    - Set the default empathy theme to classic for blindness and braille
+      accessibility profiles.
+
+  [ Jamie Bennett ]
+  * Speed up work around debconf-communicate. Replace several calls to
+    debconf-communicate with one persistent invocation followed by 
+    confmodule calls.
+  * Disable guest account by rm'ing rather than waiting for dpkg to
+    remove it.
+
+ -- Colin Watson <[e-mail]>  Wed, 03 Feb 2010 16:41:57 -0800
+
+casper (1.215) lucid; urgency=low
 
   [ Mario Limonciello ]
   * Support multiple preseed file/urlarguments on the kernel commandline
@@ -18,6 +746,46 @@
 
  -- Jonathan Riddell <[e-mail]>  Wed, 27 Jan 2010 13:55:42 +0000
 
+casper (1.214) lucid; urgency=low
+
+  * 15autologin: simplify the code with escape character evaluation
+    (LP: #505140)
+
+ -- Didier Roche <[e-mail]>  Tue, 12 Jan 2010 08:57:05 +0100
+
+casper (1.213) lucid; urgency=low
+
+  * printf does not evaluate escape characters in the argument string.
+
+ -- Evan Dandrea <[e-mail]>  Mon, 11 Jan 2010 11:02:12 +0000
+
+casper (1.212) lucid; urgency=low
+
+  [ Martin Pitt ]
+  * debian/control: Add ${misc:Depends}.
+  * debian/control: Bump Standards-Version to 3.8.3 (no changes necessary).
+
+  [ Colin Watson ]
+  * 15autologin: Use printf rather than echo -e, since its behaviour is
+    portable across shells.
+
+  [ Evan Dandrea ]
+  * Remove scripts/casper-bottom/42disable_apparmor.  Apparmor
+    2.3.1+bzr1312-0ubuntu3 and ifupdown 0.6.8ubuntu26 now no-op when
+    they detect the live CD environment.
+
+ -- Evan Dandrea <[e-mail]>  Fri, 08 Jan 2010 20:31:26 +0000
+
+casper (1.211) lucid; urgency=low
+
+  * Readd scripts/casper-bottom/15autologin changes: derivatives have
+    now a custom.conf file and still need autologin in live version.
+    Merge with my previous fix proposed for sponsoring one week ago:
+    use echo -e to enable \n interpretation (/bin/sh is busybox ash
+    which behavior differs from vanilla ash interpretor) (LP: #500786) 
+
+ -- Didier Roche <[e-mail]>  Tue, 05 Jan 2010 20:05:26 +0100
+
 casper (1.210) lucid; urgency=low
 
   [ Scott James Remnant ]
 
=== modified file 'debian/control'
--- debian/control	2010-01-20 23:35:11 +0000
+++ debian/control	2011-10-06 10:04:28 +0000
@@ -2,23 +2,23 @@
 Section: misc
 Priority: optional
 Maintainer: Ubuntu Core Developers <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50~), lsb-release
-Standards-Version: 3.6.1
-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/casper/trunk/
+Build-Depends: debhelper (>= 7.0.50~), lsb-release, libplymouth-dev (>= 0.8.0~-13), pkg-config
+Standards-Version: 3.8.4
+Vcs-Bzr: lp:ubuntu/casper
 
 Package: casper
 Architecture: any
 Section: misc
 Priority: extra
-Depends: ${shlibs:Depends}, initramfs-tools (>= 0.92bubuntu55), busybox-initramfs (>= 1:1.1.3-4ubuntu3), dmsetup, user-setup, sudo, eject, uuid-runtime, localechooser-data (>= 2.03ubuntu1), util-linux (>= 2.15-1)
-Conflicts: usplash (<< 0.4-43)
+Depends: ${shlibs:Depends}, ${misc:Depends}, initramfs-tools (>= 0.92bubuntu55), busybox-initramfs (>= 1:1.1.3-4ubuntu3), dmsetup, user-setup, sudo, eject, uuid-runtime, localechooser-data (>= 2.03ubuntu1), util-linux (>= 2.15-1), file, lzma
+Conflicts: usplash (<< 0.4-43), live-initramfs
 Breaks: genext2fs (<< 1.4.1)
 Tag: admin::boot, admin::filesystem, implemented-in::shell, protocol::smb, role::plugin, scope::utility, special::completely-tagged, works-with-format::iso9660
 Description: Run a "live" preinstalled system from read-only media
 
 Package: ubiquity-casper
 Architecture: all
-Depends: laptop-detect, sudo
+Depends: laptop-detect, sudo, ${misc:Depends}
 Conflicts: espresso-casper
 Replaces: espresso-casper
 Enhances: ubiquity
 
=== modified file 'debian/copyright'
--- debian/copyright	2009-01-13 18:56:31 +0000
+++ debian/copyright	2011-10-06 10:04:28 +0000
@@ -28,10 +28,20 @@
 	3. This notice may not be removed or altered from any source
 	   distribution.
 
+License (bin/casper-set-selections):
+
+	The Debian installer preseeder is copyright 2004 by Joey Hess
+	<[e-mail]> and others.
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
 License (everything else):
 
 	Copyright (C) 2006 Marco Amadori <[e-mail]>
-	Copyright (C) 2005-2008 Canonical Ltd. <http://www.canonical.com/>
+	Copyright (C) 2005-2011 Canonical Ltd. <http://www.canonical.com/>
 	Copyright (C) 2008 Dell Inc.
 
 	This program is free software; you can redistribute it and/or modify
 
=== modified file 'debian/manpage/casper.7'
--- debian/manpage/casper.7	2009-06-02 13:57:02 +0000
+++ debian/manpage/casper.7	2011-10-06 10:04:28 +0000
@@ -51,6 +51,9 @@
 .B nopersistent
 disables the above mentioned "persistent" feature, useful if the bootloader (like syslinux) has been installed with persistent enabled.
 .TP
+.BI "persistent-path=" PATH
+Casper will look for persistency files in the root directory of a partition. With this parameter, the path can be configured so that you can have multiple directories on the same partition to store persistency files.
+.TP
 .B "showmounts"
 This parameter will make casper to show on "/" the ro filesystems (mostly compressed) on /casper. This is not enabled by default because could lead to problems by applications like "mono" which store binary paths on installation.
 .TP
@@ -66,9 +69,18 @@
 .BI "{preseed/file|file}=" FILE
 A path to a file present on the rootfs could be used to preseed debconf database.
 .TP
+.B preseed/allow-network=true
+Bring up the network while running
+.BR preseed/early_command .
+.TP
 .BI "package/question=" VALUE
 All debian installed packages could be preseeded from command-line that way, beware of blanks spaces, they will interfere with parsing, use a preseed file in this case.
 .TP
+.BI "uuid=" UUID
+Check that the discovered medium matches
+.I UUID
+rather than the default UUID embedded in the initramfs.
+.TP
 .BI ignore_uuid
 Do not check that any UUID embedded in the initramfs matches the discovered medium.
 .B casper
 
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2011-10-06 10:04:28 +0000
@@ -0,0 +1,1 @@
+3.0 (native)
 
=== modified file 'hooks/casper'
--- hooks/casper	2009-05-23 22:30:56 +0000
+++ hooks/casper	2011-10-06 10:04:28 +0000
@@ -20,6 +20,7 @@
 
 manual_add_modules unionfs
 manual_add_modules aufs
+manual_add_modules overlayfs
 
 # unionfs-fuse, if available
 if [ -x /usr/bin/unionfs-fuse ]; then
@@ -33,8 +34,10 @@
 mkdir -p ${DESTDIR}/lib/casper
 copy_exec /usr/share/casper/casper-reconfigure /bin
 copy_exec /usr/share/casper/casper-preseed /bin
+copy_exec /usr/share/casper/casper-set-selections /bin
 
-mkdir -p ${DESTDIR}/lib/udev
+mkdir -p ${DESTDIR}/lib/udev/rules.d
+cp -p /lib/udev/rules.d/60-cdrom_id.rules ${DESTDIR}/lib/udev/rules.d/
 copy_exec /lib/udev/cdrom_id /lib/udev
 copy_exec /lib/udev/path_id /lib/udev
 copy_exec /usr/bin/eject /bin
@@ -55,6 +58,7 @@
 manual_add_modules vfat
 manual_add_modules ext3
 manual_add_modules ext4
+manual_add_modules btrfs
 # needed for vfat. :-/
 manual_add_modules nls_cp437
 manual_add_modules nls_utf8
 
=== modified file 'scripts/casper'
--- scripts/casper	2009-10-06 12:07:52 +0000
+++ scripts/casper	2011-10-06 10:04:28 +0000
@@ -6,6 +6,7 @@
 
 mountpoint=/cdrom
 LIVE_MEDIA_PATH=casper
+[ -f /conf/uuid.conf ] && UUID="$(cat /conf/uuid.conf)"
 
 root_persistence="casper-rw"
 home_persistence="home-rw"
@@ -38,24 +39,32 @@
                 export PERSISTENT="Yes" ;;
             nopersistent)
                 export PERSISTENT="" ;;
+            persistent-path=*)
+                export PERSISTENT_PATH="${x#persistent-path=}" ;;
             union=*)
                 export UNIONFS="${x#union=}";;
-            ip*)
+            ip=*)
                 STATICIP=${x#ip=}
                 if [ "${STATICIP}" = "" ]; then
                     STATICIP="frommedia"
                 fi
                 export STATICIP ;;
+            uuid=*)
+                UUID=${x#uuid=} ;;
             ignore_uuid)
-                IGNORE_UUID="Yes" ;;
+                UUID="" ;;
             live-media-path=*)
                 LIVE_MEDIA_PATH="${x#live-media-path=}"
                 export LIVE_MEDIA_PATH
                 echo "export LIVE_MEDIA_PATH=\"$LIVE_MEDIA_PATH\"" >> /etc/casper.conf ;;
+            toram)
+                export TORAM="Yes" ;;
+            todisk=*)
+                export TODISK="${x#todisk=}" ;;
         esac
     done
     if [ "${UNIONFS}" = "" ]; then
-        export UNIONFS="aufs"
+        export UNIONFS="DEFAULT"
     fi
 }
 
@@ -72,15 +81,14 @@
 }
 
 matches_uuid() {
-    if [ "$IGNORE_UUID" ] || [ ! -e /conf/uuid.conf ]; then
+    if [ -z "$UUID" ]; then
         return 0
     fi
     path="$1"
-    uuid="$(cat /conf/uuid.conf)"
     for try_uuid_file in "$path/.disk/casper-uuid"*; do
         [ -e "$try_uuid_file" ] || continue
         try_uuid="$(cat "$try_uuid_file")"
-        if [ "$uuid" = "$try_uuid" ]; then
+        if [ "$UUID" = "$try_uuid" ]; then
             return 0
         fi
     done
@@ -125,7 +133,7 @@
 
 is_nice_device() {
     sysfs_path="${1#/sys}"
-    if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-[^-]*-(ide|scsi|usb)|platform-orion-ehci|platform-mmc|platform-mxsdhci)"; then
+    if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|sas|scsi|usb|virtio)|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci)"; then
         return 0
     fi
     if echo ${sysfs_path} | grep -q "^/block/dm-"; then
@@ -143,7 +151,7 @@
 
     if [ "${copytodev}" = "ram" ]; then
         # copying to ram:
-        freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $( cat /proc/meminfo | grep Cached | head -n 1 | awk '/Cached/{print $2}' - ) )
+        freespace=$(awk '/^MemFree:/{f=$2} /^Cached:/{c=$2} END{print f+c}' /proc/meminfo)
         mount_options="-o size=${size}k"
         free_string="memory"
         fstype="tmpfs"
@@ -169,7 +177,10 @@
     mkdir "${copyto}"
     echo "mount -t ${fstype} ${mount_options} ${dev} ${copyto}"
     mount -t "${fstype}" ${mount_options} "${dev}" "${copyto}"
-    cp -a ${copyfrom}/* ${copyto} # "cp -a" from busybox also copies hidden files
+    cp -a ${copyfrom}/* ${copyto}
+    if [ -e ${copyfrom}/.disk ]; then
+        cp -a ${copyfrom}/.disk ${copyto}
+    fi
     umount ${copyfrom}
     mount -r -o move ${copyto} ${copyfrom}
     rmdir ${copyto}
@@ -184,7 +195,8 @@
     /sbin/udevadm trigger
     /sbin/udevadm settle
 
-    ipconfig ${DEVICE} /tmp/net-${DEVICE}.conf | tee /netboot.config
+    configure_networking
+    export DEVICE
 
     if [ "${NFSROOT}" = "auto" ]; then
         NFSROOT=${ROOTSERVER}:${ROOTPATH}
@@ -255,7 +267,7 @@
             todev=$(cat /proc/mounts | grep -s " $(base_path ${todir}) " | awk '{print $1}' )
             freespace=$(df -k  | grep -s ${todev} | awk '{print $4}')
         else
-            freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $( cat /proc/meminfo | grep Cached | head -n 1 | awk '/Cached/{print $2}' - ))
+            freespace=$(awk '/^MemFree:/{f=$2} /^Cached:/{c=$2} END{print f+c}' /proc/meminfo)
         fi
 
         tomount="/mnt/tmpsnap"
@@ -355,15 +367,23 @@
     image_directory="$1"
     rootmnt="$2"
 
-    case ${UNIONFS} in
-        aufs|unionfs)
-            modprobe "${MP_QUIET}" -b ${UNIONFS} || true
-            if ! cut -f2 /proc/filesystems | grep -q "^${UNIONFS}\$" && \
-               [ -x /bin/unionfs-fuse ]; then
-                UNIONFS="unionfs-fuse"
-            fi
-            ;;
-    esac
+    if [ "${UNIONFS}" = 'DEFAULT' ]; then
+	for union in 'overlayfs' 'aufs' 'unionfs'
+	do
+            modprobe "${MP_QUIET}" -b ${union} || true
+            if cut -f2 /proc/filesystems | grep -q "^${union}\$"; then
+		UNIONFS="${union}"
+		break
+	    fi
+	done
+    fi
+    if [ "${UNIONFS}" = 'DEFAULT' -a -x /bin/unionfs-fuse ]; then
+	UNIONFS="unionfs-fuse"
+    fi
+    # If all else fails fall back to aufs.
+    if [ "${UNIONFS}" = 'DEFAULT' ]; then
+	UNIONFS='aufs'
+    fi
 
     # run-init can't deal with images in a subdir, but we're going to
     # move all of these away before it runs anyway.  No, we're not,
@@ -375,9 +395,7 @@
     # Let's just mount the read-only file systems first
     rofsstring=""
     rofslist=""
-    if [ "${NETBOOT}" = "nfs" ] ; then
-        roopt="nfsro" # work around a bug in nfs-unionfs locking
-    elif [ "${UNIONFS}" = "aufs" ]; then
+    if [ "${UNIONFS}" = "aufs" ]; then
         roopt="rr"
     elif [ "${UNIONFS}" = "unionfs-fuse" ]; then
         roopt="RO"
@@ -431,9 +449,29 @@
             mkdir -p /dev/.initramfs/varrun
             pidof unionfs-fuse >> /dev/.initramfs/varrun/sendsigs.omit || true
             ;;
-        *)
+        aufs|unionfs)
             mount -t ${UNIONFS} -o noatime,dirs=/cow=rw:$rofsstring ${UNIONFS} "$rootmnt" || panic "${UNIONFS} mount failed"
             ;;
+	overlayfs)
+	    # Mount the layers pairwise from the bottom onto rootmnt,
+	    # for the second and later layers rootmnt forms the lower layer.
+	    mounts=""
+	    for mount in /cow $rofslist
+	    do
+		mounts="$mount $mounts"
+	    done
+	    lower=""
+	    for mount in $mounts
+	    do
+		if [ "$lower" = "" ]; then
+		    lower="$mount"
+		    continue
+		fi
+		mount -t overlayfs -o "upperdir=$mount,lowerdir=$lower" \
+		    "$mount" "$rootmnt"
+		lower="$rootmnt"
+	    done
+	    ;;
     esac
 
     # Adding other custom mounts
@@ -545,7 +583,7 @@
         fi
     fi
     # or do the scan of block devices
-    for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|fd)"); do
+    for sysblock in $(echo /sys/block/* | tr ' ' '\n' | egrep -v "/(loop|ram|fd)"); do
         devname=$(sys2dev "${sysblock}")
         [ -e "$devname" ] || continue
         fstype=$(get_fstype "${devname}")
@@ -562,7 +600,8 @@
         elif [ "${fstype}" = "squashfs" -o \
                 "${fstype}" = "ext4" -o \
                 "${fstype}" = "ext3" -o \
-                "${fstype}" = "ext2" ]; then
+                "${fstype}" = "ext2" -o \
+                "${fstype}" = "btrfs" ]; then
             # This is an ugly hack situation, the block device has
             # an image directly on it.  It's hopefully
             # casper, so take it and run with it.
@@ -651,6 +690,34 @@
         mount -n -o bind /dev "${rootmnt}/dev"
     fi
 
+    # Open up two fifo's fd's for debconf-communicate to use. Speeds up
+    # the Casper process considerably.
+    log_begin_msg "Creating debconf-communicate fifo mechanism"
+    mkfifo /tmp/debconf-in.fifo
+    mkfifo /tmp/debconf-out.fifo
+
+    # Make the template database read-only, so that passthrough debconf
+    # instances can write to it directly; otherwise templates are only
+    # passed through when necessary.  Use temporary config databases as
+    # well; we'll copy their contents back at the end.
+    DEBCONF_TMPDIR="$(chroot /root mktemp -dt debconf.XXXXXX)"
+    cp -a /root/var/cache/debconf/config.dat "/root$DEBCONF_TMPDIR/"
+    cp -a /root/var/cache/debconf/passwords.dat "/root$DEBCONF_TMPDIR/"
+    sed "s,^Filename: /var/cache/debconf/\(config\|passwords\).dat$,Filename: $DEBCONF_TMPDIR/\1.dat,; /^Name: templatedb/a\
+Readonly: true" /root/etc/debconf.conf >"/root$DEBCONF_TMPDIR/debconf.conf"
+
+    DEBCONF_SYSTEMRC="$DEBCONF_TMPDIR/debconf.conf" chroot /root debconf-communicate -fnoninteractive casper > /tmp/debconf-out.fifo < /tmp/debconf-in.fifo &
+
+    if [ ! -p /tmp/debconf-in.fifo ] || [ ! -p /tmp/debconf-out.fifo ]; then
+        log_warning_msg "failed to setup debconf-communicate channel"
+    fi
+    log_end_msg
+
+    # Order matters!
+    # These file descriptors must stay open until we're finished with
+    # debconf-communicate.
+    exec 4</tmp/debconf-out.fifo 3>/tmp/debconf-in.fifo
+
     maybe_break casper-bottom
     [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/casper-bottom"
 
@@ -661,6 +728,20 @@
         umount "${rootmnt}/dev"
     fi
 
+    # Close the fd's associated with debconf-communicate.
+    exec 3>&- 4<&-
+    rm -f /tmp/debconf-in.fifo
+    rm -f /tmp/debconf-out.fifo
+
+    # Copy config database changes back to the master files.
+    chroot /root debconf-copydb tmpdb config \
+	--config=Name:tmpdb --config=Driver:File \
+	--config="Filename:$DEBCONF_TMPDIR/config.dat"
+    chroot /root debconf-copydb tmpdb passwords \
+	--config=Name:tmpdb --config=Driver:File \
+	--config="Filename:$DEBCONF_TMPDIR/passwords.dat"
+    rm -rf "$DEBCONF_TMPDIR"
+
     exec 1>&6 6>&-
     exec 2>&7 7>&-
     kill "$tailpid"
 
=== modified file 'scripts/casper-bottom/05mountpoints'
--- scripts/casper-bottom/05mountpoints	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/05mountpoints	2011-10-06 10:04:28 +0000
@@ -24,4 +24,8 @@
 mkdir -p /root/cdrom
 mount -n -o move /cdrom /root/cdrom
 
+# temporary hack for LP#727783
+mkdir -p /root/media
+ln -s /cdrom /root/media/cdrom
+
 log_end_msg
 
=== added file 'scripts/casper-bottom/07remove_oem_config'
--- scripts/casper-bottom/07remove_oem_config	1970-01-01 00:00:00 +0000
+++ scripts/casper-bottom/07remove_oem_config	2011-10-06 10:04:28 +0000
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+PREREQ=""
+DESCRIPTION="Removing oem-config if installed..."
+
+prereqs()
+{
+       echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+       prereqs
+       exit 0
+       ;;
+esac
+
+. /scripts/casper-functions
+
+# Only do this on ARM
+if ! uname -m | grep -q arm; then exit 0; fi
+
+log_begin_msg "$DESCRIPTION"
+
+# if oem-config is installed, we need to remove it to remove the desktop
+# file diversion, and to remove the OEM icons from showing up before we
+# install the image.
+
+chroot /root apt-get -y --purge remove oem-config </dev/null || true
+
+log_end_msg
 
=== modified file 'scripts/casper-bottom/10adduser'
--- scripts/casper-bottom/10adduser	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/10adduser	2011-10-06 10:04:28 +0000
@@ -17,28 +17,25 @@
 esac
 
 . /scripts/casper-functions
+load_confmodule
 
 log_begin_msg "$DESCRIPTION"
 
 # U6aMy0wojraho is just a blank password
-chroot /root debconf-communicate -fnoninteractive casper > /dev/null <<EOF
-set passwd/root-password-crypted *
-set passwd/user-password-crypted U6aMy0wojraho
-set passwd/user-fullname $USERFULLNAME 
-set passwd/username $USERNAME
-set passwd/user-uid 999
-EOF
+db_set passwd/root-password-crypted '*'
+db_set passwd/user-password-crypted U6aMy0wojraho
+db_set passwd/user-fullname "$USERFULLNAME"
+db_set passwd/username "$USERNAME"
+db_set passwd/user-uid 999
 
 chroot /root /usr/lib/user-setup/user-setup-apply > /dev/null
 
 # Clear out debconf database again to avoid confusing ubiquity later.
-chroot /root debconf-communicate -fnoninteractive casper > /dev/null <<EOF
-set passwd/root-password-crypted
-set passwd/user-password-crypted
-set passwd/user-fullname
-set passwd/username
-set passwd/user-uid
-EOF
+db_set passwd/root-password-crypted
+db_set passwd/user-password-crypted
+db_set passwd/user-fullname
+db_set passwd/username
+db_set passwd/user-uid
 
 if [ -f /root/etc/sudoers ]; then
     if [ "${BUILD_SYSTEM}" = "Ubuntu" ]; then
@@ -55,7 +52,11 @@
 # XXX - awful hack to stop xscreensaver locking the screen (#7150)
 echo 'RUNNING_UNDER_GDM="yes"' >> /root/etc/environment
 
-RELEASE="$(cut -d' ' -f1-2 /root/cdrom/.disk/info 2>/dev/null)" || RELEASE=""
+LTS="$(cut -d' ' -f3 /root/cdrom/.disk/info 2>/dev/null)" || LTS=
+RELEASE="$(cut -d' ' -f1-2 /root/cdrom/.disk/info 2>/dev/null)" || RELEASE=
+if [ "$LTS" = "LTS" ] && [ -n "$RELEASE" ]; then
+	RELEASE="$RELEASE LTS"
+fi
 for file in /usr/share/applications/ubiquity-gtkui.desktop /usr/share/applications/kde4/ubiquity-kdeui.desktop; do
     if [ -f "/root/$file" ]; then
         sed -i "s/RELEASE/$RELEASE/" "/root$file"
@@ -97,15 +98,4 @@
   fi
 fi
 
-#Mythbuntu
-if [ -d "/root/usr/share/mythbuntu" ]; then
-  if [ -f "/root/usr/share/applications/mythbuntu-live-frontend.desktop" ]; then
-    chroot /root install -d -o $USERNAME -g $USERNAME /home/$USERNAME/Desktop
-    chroot /root install -D -o $USERNAME -g $USERNAME /usr/share/applications/mythbuntu-live-frontend.desktop /home/$USERNAME/Desktop/mythbuntu-live-frontend.desktop
-  fi
-  if [ -f "/root/etc/xdg/mythbuntu/xfce4/mcs_settings/desktop.xml" ]; then
-    sed -i "s/<\/mcs/\t<option\ name=\"showremovable\"\ type=\"int\"\ value=\"0\"\/>\n<\/mcs/" /root/etc/xdg/mythbuntu/xfce4/mcs_settings/desktop.xml 
-  fi
-fi
-
 log_end_msg
 
=== modified file 'scripts/casper-bottom/15autologin'
--- scripts/casper-bottom/15autologin	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/15autologin	2011-10-06 10:04:28 +0000
@@ -20,16 +20,24 @@
 
 log_begin_msg "$DESCRIPTION"
 
-if [ -d /root/etc/gdm ] && [ ! -e /root/etc/gdm/custom.conf ]; then
+if [ -d /root/etc/gdm ]; then
     # Configure GDM autologin
-    cat > /root/etc/gdm/custom.conf <<EOF
-[daemon]
-AutomaticLoginEnable=true
-AutomaticLogin=$USERNAME
-TimedLoginEnable=true
-TimedLogin=$USERNAME
-TimedLoginDelay=10
-EOF
+    GDMCustomFile=/root/etc/gdm/custom.conf
+    AutologinParameters="AutomaticLoginEnable=true\n\
+AutomaticLogin=$USERNAME\n\
+TimedLoginEnable=true\n\
+TimedLogin=$USERNAME\n\
+TimedLoginDelay=10"
+
+    # Prevent from updating if parameters already present (persistent usb key)
+    if ! `grep -qs 'AutomaticLoginEnable' $GDMCustomFile` ; then
+        if ! `grep -qs '\[daemon\]' $GDMCustomFile` ; then
+            echo '[daemon]' >> $GDMCustomFile
+        fi
+        sed -i "s/\[daemon\]/\[daemon\]\n$AutologinParameters/" $GDMCustomFile
+        chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool \
+            /apps/indicator-session/suppress_logout_menuitem true
+    fi
 fi
 
 if [ -f /root/etc/kde4/kdm/kdmrc ]; then
@@ -41,4 +49,40 @@
         /root/etc/kde4/kdm/kdmrc
 fi
 
+if [ -f /root/etc/lxdm/lxdm.conf ]; then
+    # Configure LXDM autologin with LXDE session
+   sed -i -r \
+        -e "s/^# autologin=dgod/autologin=$USERNAME/" \
+        -e "s/^# session/session/" \
+        -e "s/startlxde/startlubuntu/" \
+        /root/etc/lxdm/lxdm.conf
+fi
+
+if [ -f /root/etc/xdg/lubuntu/lxdm/lxdm.conf ]; then
+    # Configure LXDM autologin with Lubuntu session
+   sed -i -r \
+        -e "s/^# autologin=dgod/autologin=$USERNAME/" \
+        -e "s/^# session/session/" \
+        -e "s/startlxde/startlubuntu/" \
+        /root/etc/xdg/lubuntu/lxdm/lxdm.conf
+fi
+
+if [ -d /root/etc/lightdm ]; then
+    # Configure LightDM autologin
+    LightDMCustomFile=/root/etc/lightdm/lightdm.conf
+    AutologinParameters="allow-guest=false\n\
+autologin-guest=false\n\
+autologin-user=$USERNAME\n\
+autologin-user-timeout=0\n\
+autologin-session=lightdm-autologin"
+
+    # Prevent from updating if parameters already present (persistent usb key)
+    if ! `grep -qs '^autologin-user' $LightDMCustomFile` ; then
+        if ! `grep -qs '\[SeatDefaults\]' $LightDMCustomFile` ; then
+            echo '[SeatDefaults]' >> $LightDMCustomFile
+        fi
+        sed -i "s/\[SeatDefaults\]/\[SeatDefaults\]\n$AutologinParameters/" $LightDMCustomFile
+    fi
+fi
+
 log_end_msg
 
=== modified file 'scripts/casper-bottom/19keyboard'
--- scripts/casper-bottom/19keyboard	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/19keyboard	2011-10-06 10:04:28 +0000
@@ -48,6 +48,24 @@
                 console-setup/modelcode\?=*)
                         csmodel=${x#console-setup/modelcode\?=}
                         ;;
+                keyboard-configuration/layoutcode=*)
+                        cslayout=${x#keyboard-configuration/layoutcode=}
+                        ;;
+                keyboard-configuration/layoutcode\?=*)
+                        cslayout=${x#keyboard-configuration/layoutcode\?=}
+                        ;;
+                keyboard-configuration/variantcode=*)
+                        csvariant=${x#keyboard-configuration/variantcode=}
+                        ;;
+                keyboard-configuration/variantcode\?=*)
+                        csvariant=${x#keyboard-configuration/variantcode\?=}
+                        ;;
+                keyboard-configuration/modelcode=*)
+                        csmodel=${x#keyboard-configuration/modelcode=}
+                        ;;
+                keyboard-configuration/modelcode\?=*)
+                        csmodel=${x#keyboard-configuration/modelcode\?=}
+                        ;;
         esac
 done
 
@@ -151,35 +169,45 @@
         fi
 }
 
-if [ -x /root/bin/setupcon ] && [ -f /root/etc/default/console-setup ]; then
+PREFIX=
+CONFIGFILE=
+if [ -f /root/etc/default/keyboard ]; then
+        PREFIX=keyboard-configuration
+        CONFIGFILE=/etc/default/keyboard
+elif [ -f /root/etc/default/console-setup ]; then
+        PREFIX=console-setup
+        CONFIGFILE=/etc/default/console-setup
+fi
+if [ -x /root/bin/setupcon ] && [ "$PREFIX" ] && [ "$CONFIGFILE" ]; then
         if [ "$cslayout" ]; then
                 csoptions=
                 adjust_console_setup
 
                 chroot /root sed -i "s/^XKBLAYOUT=.*/XKBLAYOUT=\"$cslayout\"/" \
-                        /etc/default/console-setup
+                        "$CONFIGFILE"
                 if [ "$csvariant" ]; then
                         chroot /root sed -i "s/^XKBVARIANT=.*/XKBVARIANT=\"$csvariant\"/" \
-                                /etc/default/console-setup
+                                "$CONFIGFILE"
                 else
-                        casper-preseed /root console-setup/variantcode '' false
+                        casper-preseed /root "$PREFIX/variantcode" '' false
                 fi
                 if [ "$csmodel" ]; then
                         chroot /root sed -i "s/^XKBMODEL=.*/XKBMODEL=\"$csmodel\"/" \
-                                /etc/default/console-setup
+                                "$CONFIGFILE"
                 else
-                        casper-preseed /root console-setup/modelcode '' false
+                        casper-preseed /root "$PREFIX/modelcode" '' false
                 fi
                 if [ "$csoptions" ]; then
                         chroot /root sed -i "s/^XKBOPTIONS=.*/XKBOPTIONS=\"$csoptions\"/" \
-                                /etc/default/console-setup
+                                "$CONFIGFILE"
                 fi
         else
-                casper-preseed /root console-setup/layoutcode '' false
-                casper-preseed /root console-setup/variantcode '' false
-                casper-preseed /root console-setup/modelcode '' false
+                casper-preseed /root "$PREFIX/layoutcode" '' false
+                casper-preseed /root "$PREFIX/variantcode" '' false
+                casper-preseed /root "$PREFIX/modelcode" '' false
         fi
-        casper-preseed /root console-setup/optionscode '' false
+        casper-preseed /root "$PREFIX/optionscode" '' false
+        # prefix remains console-setup even with keyboard-configuration
         casper-preseed /root console-setup/codesetcode '' false
 
         if [ -f /root/etc/init.d/usplash ]; then
 
=== modified file 'scripts/casper-bottom/22gnome_panel_data'
--- scripts/casper-bottom/22gnome_panel_data	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/22gnome_panel_data	2011-10-06 10:04:28 +0000
@@ -20,12 +20,6 @@
 
 log_begin_msg "$DESCRIPTION"
 
-if [ -x /root/usr/sbin/laptop-detect ]; then
-	if chroot /root laptop-detect; then
-	    casper-reconfigure /root gnome-panel-data
-	fi
-fi
-
 panel_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnome-panel-data 2>/dev/null) || panel_version=""
 if [ -n "$panel_version" ]; then
     chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/panel/global/disable_lock_screen true
 
=== modified file 'scripts/casper-bottom/22screensaver'
--- scripts/casper-bottom/22screensaver	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/22screensaver	2011-10-06 10:04:28 +0000
@@ -22,9 +22,7 @@
 
 gnome_screensaver_version=$(chroot /root dpkg-query -W --showformat='${Version}' gnome-screensaver 2>/dev/null) || gnome_screensaver_version=""
 if [ -n "$gnome_screensaver_version" ]; then
-    # Support legacy gconf value
-    chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s /apps/gnome-screensaver/lock false
-    chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s /apps/gnome-screensaver/lock_enabled false
+    chroot /root sudo -u "$USERNAME" gsettings set org.gnome.desktop.screensaver lock-enabled  false
 fi
 
 if [ -d /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config ]; then
 
=== modified file 'scripts/casper-bottom/22sslcert'
--- scripts/casper-bottom/22sslcert	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/22sslcert	2011-10-06 10:04:28 +0000
@@ -17,6 +17,7 @@
 esac
 
 . /scripts/casper-functions
+load_confmodule
 
 log_begin_msg "$DESCRIPTION"
 
 
=== modified file 'scripts/casper-bottom/23networking'
--- scripts/casper-bottom/23networking	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/23networking	2011-10-06 10:04:28 +0000
@@ -73,27 +73,32 @@
 EOF
         done
     fi
-    if [ ! -f /root/etc/resolv.conf -a -f /netboot.config ] ; then
-        # create a resolv.conf if it is not present
-        cp /netboot.config /root/var/log/netboot.config
-        rc_search=$(cat netboot.config | awk '/domain/{print $3}')
-        rc_server0=$(cat netboot.config | awk '/dns0/{print $5}')
-        rc_server1=$(cat netboot.config | awk '/dns0/{print $8}')
-        rc_server0="nameserver ${rc_server0}"
-        if [ "${rc_server1}" = "0.0.0.0" ]; then
-            rc_server1=""
-        else
-            rc_server1="nameserver ${rc_server1}"
-        fi
-        cat > /root/etc/resolv.conf <<EOF
+    if [ ! -f /root/etc/resolv.conf ] || [ -z "$(cat /root/etc/resolv.conf)" ]; then
+        if [ -n "${DEVICE}" ] && [ -e /tmp/net-"${DEVICE}".conf ]; then
+            # create a resolv.conf if it is not present
+            cp /tmp/net-"${DEVICE}".conf /root/var/log/netboot.config
+            #ipconfig quotes DNSDOMAIN, quotes need to be removed for a correct resolv.conf
+            rc_search="$(sed -n 's/"//g;s/^DNSDOMAIN=//p' /tmp/net-"${DEVICE}".conf)"
+            #search might contain multiple entries but domain should only have one.
+            rc_domain="$(sed -n -e 's/"//g;s/^DNSDOMAIN=\([^ ]\+\) *.*/\1/p'  /tmp/net-"${DEVICE}".conf)"
+            rc_server0="$(sed -n 's/^IPV4DNS0=//p' /tmp/net-"${DEVICE}".conf)"
+            rc_server1="$(sed -n 's/^IPV4DNS1=//p' /tmp/net-"${DEVICE}".conf)"
+            rc_server0="nameserver ${rc_server0}"
+            if [ "${rc_server1}" = "0.0.0.0" ]; then
+                rc_server1=""
+            else
+                rc_server1="nameserver ${rc_server1}"
+            fi
+            cat > /root/etc/resolv.conf <<EOF
 # /etc/resolv.conf
 # Autogenerated by casper
 search ${rc_search}
-domain ${rc_search}
+domain ${rc_domain}
 ${rc_server0}
 ${rc_server1}
 EOF
-        cat /root/etc/resolv.conf >> /root/var/log/netboot.config
+            cat /root/etc/resolv.conf >> /root/var/log/netboot.config
+        fi
     fi
 fi
 
 
=== modified file 'scripts/casper-bottom/24preseed'
--- scripts/casper-bottom/24preseed	2010-01-20 23:33:29 +0000
+++ scripts/casper-bottom/24preseed	2011-10-06 10:04:28 +0000
@@ -17,13 +17,40 @@
 esac
 
 . /scripts/casper-functions
+load_confmodule
 
 log_begin_msg "$DESCRIPTION"
 
 if [ -e /preseed.cfg ]; then
-	chroot /root debconf-set-selections < /preseed.cfg
+	casper-set-selections /preseed.cfg
 fi
 
+network_started=
+
+start_network () {
+	[ -z "$network_started" ] || return
+	[ -z "$NETBOOT" ] || return
+
+	mount -n -o bind /sys /root/sys
+	mount -n -o bind /proc /root/proc
+	mount -n -o bind /dev /root/dev
+	mkdir -p /root/var/run/network
+	# Close inherited fd's to prevent debconf-communicate from
+	# continuing to run post-casper.
+	chroot /root dhclient eth0 3>&- 4<&-
+
+	network_started=1
+}
+
+stop_network () {
+	[ "$network_started" ] || return
+
+	chroot /root ifconfig eth0 down
+	umount /root/sys
+	umount /root/proc
+	umount /root/dev
+}
+
 locations=
 for x in $(cat /proc/cmdline); do
 	case $x in
@@ -35,16 +62,8 @@
 			;;
 		url=*)
 			url_location="${x#url=}"
-			mount -n -o bind /sys /root/sys
-			mount -n -o bind /proc /root/proc
-			mount -n -o bind /dev /root/dev
-			mkdir -p /root/var/run/network
-			[ "$NETBOOT" ] || chroot /root dhclient eth0
+			start_network
 			chroot /root wget -P /tmp "$url_location"
-			[ "$NETBOOT" ] || chroot /root ifconfig eth0 down
-			umount /root/sys
-			umount /root/proc
-			umount /root/dev
 			locations="/tmp/$(basename "$url_location") $locations"
 			;;
 		*/*\?=*)
@@ -66,16 +85,22 @@
 
 if [ "$locations" ]; then
 	for item in $locations; do
-		chroot /root debconf-set-selections < "/root$item"
+		casper-set-selections "/root$item"
 	done
 fi
 
-reply="$(echo "GET preseed/early_command" | chroot /root debconf-communicate -fnoninteractive casper)"
-if [ "${reply#0 }" != "$reply" ]; then
-	reply="${reply#0 }"
-	sh -c "$reply"
+if db_get preseed/early_command && [ "$RET" ]; then
+	EARLY="$RET"
+	if db_get preseed/allow-network && [ "$RET" = true ]; then
+		start_network
+	fi
+	DEBIAN_HAS_FRONTEND= DEBCONF_REDIR= \
+	DEBIAN_FRONTEND=noninteractive \
+	sh -c "$EARLY"
 fi
 
+stop_network
+
 # Clear out debconf database backup files to save memory.
 rm -f /root/var/cache/debconf/*.dat-old
 
 
=== modified file 'scripts/casper-bottom/25configure_init'
--- scripts/casper-bottom/25configure_init	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/25configure_init	2011-10-06 10:04:28 +0000
@@ -54,7 +54,7 @@
 rm -f /root/etc/rc?.d/[SK]??postfix
 
 # Avoid clobbering the user's clock
-rm -f /root/etc/rc?.d/K??hwclock.sh
+rm -f /root/etc/rc?.d/K??hwclock.sh /root/etc/init/hwclock-save.conf
 
 # Disable readahead since it doesn't play well with squashfs + unionfs
 # use chmod instead of mv to not trigger unionfs bugs.
@@ -65,7 +65,7 @@
 # Disable ureadahead too since we don't ship a pack file for it anyway, so
 # all we'll end up doing is profiling the live CD boot. ureadahead also
 # breaks partman occasionally by reading from its synchronisation FIFOs.
-rm -f /root/etc/init/ureadahead.conf
+rm -f /root/etc/init/ureadahead*.conf
 
 log_end_msg
 
 
=== added file 'scripts/casper-bottom/26disable_user_menu'
--- scripts/casper-bottom/26disable_user_menu	1970-01-01 00:00:00 +0000
+++ scripts/casper-bottom/26disable_user_menu	2011-10-06 10:04:28 +0000
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+PREREQ=""
+DESCRIPTION="Disabling user menu..."
+
+prereqs()
+{
+       echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+       prereqs
+       exit 0
+       ;;
+esac
+
+. /scripts/casper-functions
+
+log_begin_msg "$DESCRIPTION"
+
+indicator_session_version=$(chroot /root dpkg-query -W --showformat='${Version}' indicator-session 2>/dev/null) || indicator_session_version=""
+if [ -n "$indicator_session_version=" ]; then
+    chroot /root sudo -u "$USERNAME" gsettings set com.canonical.indicator.session user-show-menu  false
+fi
+
+log_end_msg
 
=== modified file 'scripts/casper-bottom/30accessibility'
--- scripts/casper-bottom/30accessibility	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/30accessibility	2011-10-06 10:04:28 +0000
@@ -1,172 +1,52 @@
 #!/bin/sh
-# If you change this, please also change the copy in ubiquity-hooks/30accessibility.
+# If you are looking to change accessibility profile settings, plesae look in
+# bin/casper-a11y-enable.
 
 PREREQ=""
 DESCRIPTION="Configuring accessibility options..."
 
 prereqs()
 {
-       echo "$PREREQ"
+	echo "$PREREQ"
 }
 
 case $1 in
 # get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+	prereqs)
+		prereqs
+	       exit 0
+	       ;;
 esac
 
 . /scripts/casper-functions
 
 log_begin_msg "$DESCRIPTION"
 
-gconf_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gconf2 2>/dev/null) || gconf_version=""
-
-gct() {
-    if [ "$gconf_version" ]; then
-        chroot /root sudo -u "$USERNAME" gconftool-2 "$@"
-    fi
-}
-
-kderc_addtoprefixes() {
-    if [ -e "/root/etc/kde4rc" ]; then
-        sed -i "s|\\(prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/\\)|\\1,$1|" /root/etc/kde4rc
-    fi
-}
-
-# Code to remove an applet from the default panel setup
-# This is rather hacky, but I can't think of a one or two line regular
-# expression to do this any more efficiently. Patches welcome.
-# In addition, setting these via gconf also doesn't work for some reason.
-remove_applet()
-{
-	local line_no prior_line next_line
-
-	line_no=$(grep -n "<string>$1</string>" /root/usr/share/gconf/defaults/05_panel-default-setup.entries | cut -f 1 -d :)
-	[ "$line_no" ] || return
-	prior_line=$((line_no-1))
-	next_line=$((line_no+1))
-	sed -i -n "${prior_line},${next_line}!p" /root/usr/share/gconf/defaults/05_panel-default-setup.entries
-	chroot /root update-gconf-defaults
-}
-
 for x in $(cat /proc/cmdline); do
-                case $x in
-                        # Lesser Visual Impairment
-                        access=v1)
-                        gct -s -t string /desktop/gnome/interface/gtk_theme HighContrastLargePrint
-                        gct -s -t string /desktop/gnome/interface/icon_theme HighContrast
-                        gct -s -t string /desktop/gnome/interface/monospace_font_name "monospace 18"
-                        gct -s -t string /desktop/gnome/interface/font_name "sans 18"
-                        gct -s -t string /apps/metacity/general/theme Atlanta
-                        gct -s -t string /desktop/gnome/background/picture_filename ""
-                        gct -s -t string /desktop/gnome/background/picture_options none
-                        gct -s -t string /desktop/gnome/background/primary_color \#666666
-                        gct -s -t string /desktop/gnome/background/secondary_color \#7F7F7F
-                        gct -s -t string /desktop/gnome/background/color_shading_type solid
-                        gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48
-                        gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
-
-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/
-                        if [ -d /root/usr/share/xubuntu-default-settings/accessibility ]; then
-                            cp -a /root/usr/share/xubuntu-default-settings/accessibility/* /root/etc/xdg/
-                        fi
-                        ;;
-                        # Moderate Visual Impairment
-                        access=v2)
-                        gct -s -t bool /desktop/gnome/interface/accessibility true
-                        gct -s -t bool /desktop/gnome/applications/at/visual/startup true
-                        gct -s -t string /desktop/gnome/applications/at/visual/exec orca
-			if [ -x /root/usr/bin/orca ]; then
-				mkdir -p /root/home/$USERNAME/.orca
-				echo "import orca.settings" >> /root/home/$USERNAME/.orca/user-settings.py
-				echo "orca.settings.enableSpeech = False" >> /root/home/$USERNAME/.orca/user-settings.py
-				echo "orca.settings.enableMagnifier = True" >> /root/home/$USERNAME/.orca/user-settings.py
-				chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.orca
-			fi
-                        gct -s -t bool /apps/gksu/disable-grab true
-                        gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
-                        sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /root/etc/sudoers
-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-impairment/
-                        ;;
-                        # Blindness
-                        access=v3)
-                        gct -s -t bool /desktop/gnome/interface/accessibility true
-                        gct -s -t bool /apps/gksu/disable-grab true
-                        gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
-                        gct -s -t bool /desktop/gnome/applications/at/visual/startup true
-                        gct -s -t string /desktop/gnome/applications/at/visual/exec orca
-                        remove_applet fast_user_switch
-			if [ -x /root/usr/bin/pulse-session ]; then
-				mkdir -p /root/var/lib/pulseaudio
-				touch /root/var/lib/pulseaudio/pulse_a11y_nostart
-				chroot /root chown root.root /var/lib/pulseaudio/pulse_a11y_nostart
-				mkdir -p /root/home/$USERNAME/.pulse
-				echo "autospawn = no" > /root/home/$USERNAME/.pulse/client.conf
-				chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.pulse
-			fi
-                        sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /root/etc/sudoers
-			if [ -x /root/usr/bin/orca ]; then
-				mkdir -p /root/home/$USERNAME/.orca
-				chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.orca
-			fi
-                        ;;
-                        # Braille
-                        braille=ask)
-                        gct -s -t bool /desktop/gnome/interface/accessibility true
-                        gct -s -t bool /desktop/gnome/applications/at/visual/startup true
-                        gct -s -t string /desktop/gnome/applications/at/visual/exec orca
-			if [ -x /root/usr/bin/orca ]; then
-				mkdir -p /root/home/$USERNAME/.orca
-				echo "import orca.settings" >> /root/home/$USERNAME/.orca/user-settings.py
-				echo "orca.settings.enableSpeech = False" >> /root/home/$USERNAME/.orca/user-settings.py
-				echo "orca.settings.enableBraille = True" >> /root/home/$USERNAME/.orca/user-settings.py
-				chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.orca
-			fi
-                        gct -s -t bool /apps/gksu/disable-grab true
-                        gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
-                        remove_applet fast_user_switch
-                        sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /root/etc/sudoers
-			if [ -x /root/usr/bin/pulse-session ]; then
-				mkdir -p /root/var/lib/pulseaudio
-				touch /root/var/lib/pulseaudio/pulse_a11y_nostart
-				chroot /root chown root.root /var/lib/pulseaudio/pulse_a11y_nostart
-				mkdir -p /root/home/$USERNAME/.pulse
-				echo "autospawn = no" > /root/home/$USERNAME/.pulse/client.conf
-				chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.pulse
-			fi
-                        ;;
-                        # Minor Motor Difficulties
-                        access=m1)
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/mousekeys_enable true
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_enable true
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep true
-                        gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
-                        gct -s -t bool /desktop/gnome/peripherals/keyboard/repeat true
-                        gct -s -t int /desktop/gnome/peripherals/keyboard/delay 700
-                        gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10
-                        gct -s -t bool /apps/gksu/disable-grab true
-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/
-                        if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
-                            sed -i 's/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
-                        fi 
-                        ;;
-                        # Motor Difficulties - pointing devices
-                        access=m2)
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
-			gct -s -t bool /desktop/gnome/interface/accessibility true
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_enable true
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep false
-                        gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
-                        gct -s -t bool /desktop/gnome/applications/at/mobility/startup true
-                        gct -s -t string /desktop/gnome/applications/at/mobility/exec onboard
-
-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/
-                        if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
-                            sed -i '/Sticky/ s/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
-                        fi 
+	case $x in
+		# Lesser Visual Impairment
+		access=v1)
+			/root/usr/bin/casper-a11y-enable -initramfs -user="$USERNAME" -chroot=/root -script high-contrast
+                        ;;
+		# Moderate Visual Impairment
+		access=v2)
+			/root/usr/bin/casper-a11y-enable -initramfs -user="$USERNAME" -chroot=/root -script magnifier
+                        ;;
+		# Blindness
+		access=v3)
+			/root/usr/bin/casper-a11y-enable -initramfs -user="$USERNAME" -chroot=/root -script blindness
+                        ;;
+		# Braille
+		braille=ask)
+			/root/usr/bin/casper-a11y-enable -initramfs -user="$USERNAME" -chroot=/root -script braille
+                        ;;
+		# Minor Motor Difficulties
+		access=m1)
+			/root/usr/bin/casper-a11y-enable -initramfs -user="$USERNAME" -chroot=/root -script keyboard-modifiers
+                        ;;
+		# Motor Difficulties - pointing devices
+		access=m2)
+			/root/usr/bin/casper-a11y-enable -initramfs -user="$USERNAME" -chroot=/root -script onscreen-keyboard
                         ;;
 		esac
 done
 
=== modified file 'scripts/casper-bottom/31disable_update_notifier'
--- scripts/casper-bottom/31disable_update_notifier	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/31disable_update_notifier	2011-10-06 10:04:28 +0000
@@ -31,4 +31,12 @@
 # 'apt-get update' equivalent, so we disable it entirely.
 rm -f /root/usr/share/autostart/adept_notifier_auto.desktop
 
+# Upgrading the live CD to new releases is probably not a great plan.
+chroot /root dpkg-divert --add --rename --quiet \
+	/usr/lib/update-manager/check-new-release
+ln -sf /bin/true /root/usr/lib/update-manager/check-new-release
+chroot /root dpkg-divert --add --rename --quiet \
+	/usr/lib/update-manager/check-new-release-gtk
+ln -sf /bin/true /root/usr/lib/update-manager/check-new-release-gtk
+
 log_end_msg
 
=== modified file 'scripts/casper-bottom/32disable_hibernation'
--- scripts/casper-bottom/32disable_hibernation	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/32disable_hibernation	2011-10-06 10:04:28 +0000
@@ -20,15 +20,11 @@
 
 log_begin_msg "$DESCRIPTION"
 
-
-gpm_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnome-power-manager 2>/dev/null) || panel_version=""
-if [ -n "$gpm_version" ]; then
-#    casper-reconfigure /root gnome-power-manager
-    chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/gnome-power-manager/general/can_hibernate false
-fi
-
-if [ -d /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config ]; then
-    echo "disableHibernate=1" >> /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/guidance-power-managerrc
-fi
+cat <<EOF > /root/var/lib/polkit-1/localauthority/50-local.d/disable-hibernate.pkla
+[Disable hibernate in live system]
+Identity=unix-user:*
+Action=org.freedesktop.upower.hibernate
+ResultActive=no
+EOF
 
 log_end_msg
 
=== added file 'scripts/casper-bottom/34disable_kde_services.OTHER'
--- scripts/casper-bottom/34disable_kde_services.OTHER	1970-01-01 00:00:00 +0000
+++ scripts/casper-bottom/34disable_kde_services.OTHER	2011-10-06 10:04:28 +0000
@@ -0,0 +1,36 @@
+#! /bin/sh
+
+PREREQ=""
+DESCRIPTION="Disabling unnecessary KDE services..."
+
+prereqs()
+{
+       echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+       prereqs
+       exit 0
+       ;;
+esac
+
+. /scripts/casper-functions
+
+log_begin_msg "$DESCRIPTION"
+
+rm -f /root/usr/share/autostart/kab2kabc.desktop
+rm -f /root/usr/share/autostart/kaddressbookmigrator.desktop
+rm -f /root/usr/share/autostart/korgac.desktop
+rm -f /root/usr/share/autostart/printer-applet.desktop
+rm -f /root/usr/share/autostart/nepomukserver.desktop
+rm -f /root/usr/share/kde4/services/kwalletd.desktop
+rm -f /root/usr/share/kde4/services/kded/kpackagekitd.desktop
+if [ -z "${PERSISTENT}" ]; then
+	rm -f /root/usr/share/kde4/services/kded/freespacenotifier.desktop
+fi
+rm -f /root/usr/share/kde4/services/plasma-runner-contacts.desktop  # starts akonadi
+rm -f /root/usr/share/kde4/services/plasma-dataengine-calendar.desktop  # starts akonadi
+
+log_end_msg
 
=== removed file 'scripts/casper-bottom/37kubuntu_netbook_installer_link'
--- scripts/casper-bottom/37kubuntu_netbook_installer_link	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/37kubuntu_netbook_installer_link	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-#! /bin/sh
-
-PREREQ=""
-DESCRIPTION="Adding installer to Kubuntu Netbook favourites..."
-
-prereqs()
-{
-       echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
-esac
-
-. /scripts/casper-functions
-
-log_begin_msg "$DESCRIPTION"
-
-if [ -e "/root/usr/share/kubuntu-netbook-default-settings/share/config/moved_plasma-netbook-appletsrc" ]; then
-    mv /root/usr/share/kubuntu-netbook-default-settings/share/config/moved_plasma-netbook-appletsrc \
-       /root/usr/share/kubuntu-netbook-default-settings/share/config/plasma-netbook-appletsrc
-fi
-
-log_end_msg
 
=== modified file 'scripts/casper-bottom/40install_driver_updates'
--- scripts/casper-bottom/40install_driver_updates	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/40install_driver_updates	2011-10-06 10:04:28 +0000
@@ -34,7 +34,13 @@
 for deb in "/root$install_dir"/*; do
 	[ -f "$deb" ] || continue
 	debbase="${deb##*/}"
-	if ! chroot /root dpkg -i "$install_dir/$debbase"; then
+	DEBIAN_HAS_FRONTEND= DEBCONF_REDIR= \
+	DEBIAN_FRONTEND=noninteractive \
+	chroot /root dpkg -i "$install_dir/$debbase"
+	ret=$?
+	if [ $ret != 0 ]; then
+		DEBIAN_HAS_FRONTEND= DEBCONF_REDIR= \
+		DEBIAN_FRONTEND=noninteractive \
 		chroot /root dpkg -P "${debbase%%_*}"
 	fi
 done
 
=== modified file 'scripts/casper-bottom/41apt_cdrom'
--- scripts/casper-bottom/41apt_cdrom	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/41apt_cdrom	2011-10-06 10:04:28 +0000
@@ -18,4 +18,12 @@
 
 . /scripts/casper-functions
 
-chroot /root apt-cdrom -m add
+mount -n -o bind /sys /root/sys
+mount -n -o bind /proc /root/proc
+mount -n -o bind /dev /root/dev
+chroot /root apt-cdrom -o Acquire::cdrom::mount=/cdrom \
+		       -o Dir::Media::MountPath=/cdrom \
+		       -o Acquire::cdrom::AutoDetect=false -m add
+umount /root/dev
+umount /root/proc
+umount /root/sys
 
=== removed file 'scripts/casper-bottom/42disable_apparmor'
--- scripts/casper-bottom/42disable_apparmor	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/42disable_apparmor	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-#!/bin/sh
-# workaround for AppArmor bug #131976
-
-PREREQ=""
-DESCRIPTION="Disabling AppArmor (does not work with stacked file systems)..."
-
-prereqs()
-{
-       echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
-esac
-
-. /scripts/casper-functions
-
-log_begin_msg "$DESCRIPTION"
-
-chroot /root update-rc.d -f apparmor remove
-
-log_end_msg
 
=== modified file 'scripts/casper-bottom/43disable_updateinitramfs'
--- scripts/casper-bottom/43disable_updateinitramfs	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/43disable_updateinitramfs	2011-10-06 10:04:28 +0000
@@ -27,13 +27,8 @@
 if [ -w /root/cdrom ] && \
    # rw is guaranteed to be first.
    grep -q ' /root/cdrom rw[, ]' /proc/self/mountinfo; then
-	cat > /root/usr/sbin/update-initramfs <<'EOF'
-#! /bin/sh
-update-initramfs.distrib "$@"
-cp /initrd.img /cdrom/casper/initrd.gz
-cp /vmlinuz /cdrom/casper/vmlinuz
-exit 0
-EOF
+	ln -s /usr/share/casper/casper-update-initramfs \
+	      /root/usr/sbin/update-initramfs
 else
 	cat > /root/usr/sbin/update-initramfs <<EOF
 #! /bin/sh
 
=== modified file 'scripts/casper-bottom/44pk_allow_ubuntu'
--- scripts/casper-bottom/44pk_allow_ubuntu	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/44pk_allow_ubuntu	2011-10-06 10:04:28 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PREREQ=""
-DESCRIPTION="Grant administrative PolicyKit pivilieges to default user..."
+DESCRIPTION="Grant administrative PolicyKit privileges to default user..."
 
 prereqs()
 {
@@ -21,27 +21,6 @@
 log_begin_msg "$DESCRIPTION"
 
 # configure PolicyKit in live session
-mkdir -p /root/etc/PolicyKit
-cat << EOF > /root/etc/PolicyKit/PolicyKit.conf
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
-
-<!DOCTYPE pkconfig PUBLIC "-//freedesktop//DTD PolicyKit Configuration 1.0//EN"
-"http://hal.freedesktop.org/releases/PolicyKit/1.0/config.dtd">
-
-<!-- See the manual page PolicyKit.conf(5) for file format -->
-
-<config version="0.1">
-    <match user="root">
-        <return result="yes"/>
-    </match>
-    <!-- don't ask password for user in live session -->
-    <match user="$USERNAME">
-        <return result="yes"/>
-    </match>
-    <define_admin_auth group="admin"/>
-</config>
-EOF
-
 mkdir -p /root/var/lib/polkit-1/localauthority/10-vendor.d
 cat << EOF > /root/var/lib/polkit-1/localauthority/10-vendor.d/10-live-cd.pkla
 # Policy to allow the livecd user to bypass policykit
@@ -49,7 +28,7 @@
 Identity=unix-user:$USERNAME
 Action=*
 ResultAny=no
-ResultInactive=no
+ResultInactive=yes
 ResultActive=yes
 EOF
 
 
=== removed file 'scripts/casper-bottom/45disable_guest_account'
--- scripts/casper-bottom/45disable_guest_account	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/45disable_guest_account	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-DESCRIPTION="Disabling gdm guest session functionality..."
-
-prereqs()
-{
-       echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
-esac
-
-. /scripts/casper-functions
-
-log_begin_msg "$DESCRIPTION"
-
-chroot /root dpkg -P gdm-guest-session || true
-
-log_end_msg
 
=== removed file 'scripts/casper-bottom/47unr_ubiquity'
--- scripts/casper-bottom/47unr_ubiquity	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/47unr_ubiquity	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-DESCRIPTION="Set ubiquity favourite for UNR..."
-
-prereqs()
-{
-       echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
-esac
-
-. /scripts/casper-functions
-
-log_begin_msg "$DESCRIPTION"
-
-gconf_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gconf2 2>/dev/null) || gconf_version=""
-
-gct() {
-    if [ "$gconf_version" ]; then
-        chroot /root sudo -u "$USERNAME" gconftool-2 "$@"
-    fi
-}
-
-if ! gct -g /apps/netbook-launcher/favorites/favorites_list | grep -q ubiquity; then
-    gct -s -t string /apps/netbook-launcher/favorites/ubiquity/type application
-    gct -s -t string /apps/netbook-launcher/favorites/ubiquity/desktop_file /usr/share/applications/ubiquity-gtkui.desktop
-    favs=$(gct -g /apps/netbook-launcher/favorites/favorites_list)
-    gct -s -t list --list-type=string /apps/netbook-launcher/favorites/favorites_list $(echo "$favs" | sed -e 's/]$/,ubiquity]/')
-fi
-
-log_end_msg
-
 
=== removed file 'scripts/casper-bottom/48enable_kubuntu_netbook'
--- scripts/casper-bottom/48enable_kubuntu_netbook	2010-01-27 13:56:03 +0000
+++ scripts/casper-bottom/48enable_kubuntu_netbook	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-#! /bin/sh
-
-PREREQ=""
-DESCRIPTION="Enabling Plasma Netbook workspace if appropriate..."
-
-prereqs()
-{
-       echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
-esac
-
-. /scripts/casper-functions
-
-log_begin_msg "$DESCRIPTION"
-
-if [ -e "/root/usr/share/autostart/plasma-netbook.desktop" ]; then
-    sed -i "s,Hidden=true,," /root/usr/share/autostart/plasma-netbook.desktop
-fi
-
-log_end_msg
 
=== added file 'scripts/casper-bottom/48kubuntu_disable_restart_notifications'
--- scripts/casper-bottom/48kubuntu_disable_restart_notifications	1970-01-01 00:00:00 +0000
+++ scripts/casper-bottom/48kubuntu_disable_restart_notifications	2011-10-06 10:04:28 +0000
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+if [ -d /root/usr/share/kubuntu-default-settings/ ]; then
+    echo "[Event]\nhideRestartNotifier=true" >> /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/notificationhelper
+fi
 
=== added file 'scripts/casper-bottom/49kubuntu_mobile_session'
--- scripts/casper-bottom/49kubuntu_mobile_session	1970-01-01 00:00:00 +0000
+++ scripts/casper-bottom/49kubuntu_mobile_session	2011-10-06 10:04:28 +0000
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+if [ -d /root/usr/share/kubuntu-mobile-default-settings/ ]; then
+    cp /root/usr/share/kubuntu-mobile-default-settings/share/nodm /root/etc/default/nodm
+fi
 
=== modified file 'scripts/casper-functions'
--- scripts/casper-functions	2008-09-18 23:39:20 +0000
+++ scripts/casper-functions	2011-10-06 10:04:28 +0000
@@ -4,7 +4,10 @@
 # Print a message and wait for enter
 log_wait_msg()
 {
-	if [ -x /sbin/usplash_write ]; then
+	if [ -x /bin/plymouth ] && plymouth --ping; then
+		plymouth message --text="$@"
+		plymouth watch-keystroke | read nunya
+	elif [ -x /sbin/usplash_write ]; then
 		/sbin/usplash_write "INPUTENTER $@"
 		read nunya < /dev/.initramfs/usplash_outfifo
 	fi
@@ -39,3 +42,14 @@
 		echo "C"
 	fi
 }
+
+load_confmodule() {
+	# Only do this once.
+	if [ -z "$DEBCONF_REDIR" ]; then
+		exec <&4
+		export DEBIAN_HAS_FRONTEND=1
+		export DEBCONF_REDIR=1
+	fi
+
+	. /root/usr/share/debconf/confmodule
+}
 
=== modified file 'scripts/casper-helpers'
--- scripts/casper-helpers	2009-05-12 12:30:01 +0000
+++ scripts/casper-helpers	2011-10-06 10:04:28 +0000
@@ -31,7 +31,7 @@
     # FIXME: do something better like the scan of supported filesystems
     fstype="${1}"
     case ${fstype} in
-        vfat|iso9660|udf|ext2|ext3|ext4|ntfs)
+        vfat|iso9660|udf|ext2|ext3|ext4|btrfs|ntfs)
             return 0
             ;;
     esac
@@ -164,6 +164,9 @@
     fi
 }
 
+# Returns 0 on success
+# panics if remount- or bind-mount fails
+# returns 1 on failure otherwise
 try_mount ()
 {
     dev="${1}"
@@ -171,19 +174,39 @@
     opts="${3}"
 
     if where_is_mounted ${dev} > /dev/null; then
-    if [ "${opts}" != "ro" ]; then
-        mount -o remount,"${opts}" ${dev} $(where_is_mounted ${dev}) || panic "Remounting failed"
-    fi
+        if [ "${opts}" != "ro" ]; then
+            mount -o remount,"${opts}" ${dev} $(where_is_mounted ${dev}) || panic "Remounting failed"
+            return 0
+        fi
         mount -o bind $(where_is_mounted ${dev}) ${mountp} || panic "Cannot bind-mount"
+        return 0
     else
-        mount -t $(get_fstype "${dev}") -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}"
+        mount -t $(get_fstype "${dev}") -o "${opts}" "${dev}" "${mountp}"
+        ret=$?
+        if [ $ret -ne 0 ]; then
+            log_warning_msg "Cannot mount ${dev} on ${mountp}"
+            return 1
+        fi
+        return 0
     fi
 }
 
 find_cow_device() {
     pers_label="${1}"
     cow_backing="/${pers_label}-backing"
+
+    if [ -z "${PERSISTENT_PATH}" ]; then
+        pers_fpath=${pers_label}
+    else
+        pers_fpath=${PERSISTENT_PATH}/${pers_label}
+    fi
+
     for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop); do
+	# do not ever probe floppies, probing nonexistant ones delays the boot to half an hour and longer
+        n=${sysblock##*/}
+        if [ "${n#fd}" != "$n" ]; then
+            continue
+        fi
         for dev in $(subdevices "${sysblock}"); do
             devname=$(sys2dev "${dev}")
             if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]; then
@@ -195,12 +218,13 @@
             # where filesystems are in use by hibernated operating systems.
             elif [ "$(get_fstype ${devname})" = "vfat" ]; then
                 mkdir -p "${cow_backing}"
-                try_mount "${devname}" "${cow_backing}" "rw"
-                if [ -e "${cow_backing}/${pers_label}" ]; then
-                    echo $(setup_loop "${cow_backing}/${pers_label}" "loop" "/sys/block/loop*")
+                try_mount "${devname}" "${cow_backing}" "rw" || continue
+                cow_backing_mp=$(where_is_mounted "${devname}")
+                if [ -e "${cow_backing_mp}/${pers_fpath}" ]; then
+                    echo $(setup_loop "${cow_backing_mp}/${pers_fpath}" "loop" "/sys/block/loop*")
                     return 0
                 else
-                    umount ${cow_backing}
+                    umount ${cow_backing_mp}
                 fi
             fi
         done
@@ -219,7 +243,7 @@
             devfstype="$(get_fstype ${devname})"
             if [ "${devfstype}" = "vfat" ] ||  [ "${devfstype}" = "ext2" ] ; then # FIXME: all supported block devices should be scanned
                 mkdir -p "${snap_backing}"
-                try_mount "${devname}" "${snap_backing}" "ro"
+                try_mount "${devname}" "${snap_backing}" "ro" || continue
                 for filename in ${filenames}; do
                     if [ -e "${snap_backing}/${filename}" ]; then
                         echo "${devname} ${snap_backing} ${filename}"
 
=== modified file 'scripts/casper-premount/10driver_updates'
--- scripts/casper-premount/10driver_updates	2010-01-05 16:54:40 +0000
+++ scripts/casper-premount/10driver_updates	2011-10-06 10:04:28 +0000
@@ -42,7 +42,7 @@
 
 is_nice_device() {
     sysfs_path="${1#/sys}"
-    if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-[^-]*-(ide|scsi|usb))"; then
+    if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|scsi|usb))"; then
         return 0
     fi
     return 1
 
=== modified file 'ubiquity-hooks/30accessibility'
--- ubiquity-hooks/30accessibility	2009-10-13 21:25:53 +0000
+++ ubiquity-hooks/30accessibility	2011-10-06 10:04:28 +0000
@@ -1,5 +1,6 @@
 #!/bin/sh
-# If you change this, please also change the copy in scripts/casper-bottom/30accessibility.
+# If you are looking to change accessibility profile settings, plesae look in
+# bin/casper-a11y-enable.
 
 . /usr/share/debconf/confmodule
 . /etc/casper.conf
@@ -9,171 +10,83 @@
 db_get passwd/username
 TARGET_USERNAME="$RET"
 
-gct() {
-    chroot /target sudo -u "$TARGET_USERNAME" gconftool-2 "$@"
-}
-
-kderc_addtoprefixes() {
-    if [ -e "/target/etc/kde4rc" ]; then
-        sed -i "s|\\(prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/\\)|\\1,$1|" /target/etc/kde4rc
-    fi
-}
-
-# Code to remove an applet from the default panel setup
-# This is rather hacky, but I can't think of a one or two line regular
-# expression to do this any more efficiently. Patches welcome.
-# In addition, setting these via gconf also doesn't work for some reason.
-remove_applet()
+copy_orca_config()
 {
-        local line_no prior_line next_line
-
-        line_no=$(grep -n "<string>$1</string>" /target/usr/share/gconf/defaults/05_panel-default-setup.entries | cut -f 1 -d :)
-        [ "$line_no" ] || return
-        prior_line=$((line_no-1))
-        next_line=$((line_no+1))
-        sed -i -n "${prior_line},${next_line}!p" /target/usr/share/gconf/defaults/05_panel-default-setup.entries
-        chroot /target update-gconf-defaults
+	if [ -f /home/$USERNAME/.local/share/orca/user-settings.conf ]; then
+		mkdir -p /target/home/$TARGET_USERNAME/.local/share
+		cp -r /home/$USERNAME/.local/share/orca /target/home/$TARGET_USERNAME/.local/share
+		chroot /target chown -R $TARGET_USERNAME.$TARGET_USERNAME /home/$TARGET_USERNAME/.local
+		chmod 755 /target/home/$TARGET_USERNAME/.local/share/orca
+	fi
 }
 
 for x in $(cat /proc/cmdline); do
-                case $x in
-                        # Lesser Visual Impairment
-                        access=v1)
-                        gct -s -t string /desktop/gnome/interface/gtk_theme HighContrastLargePrint
-                        gct -s -t string /desktop/gnome/interface/icon_theme HighContrast
-                        gct -s -t string /desktop/gnome/interface/monospace_font_name "monospace 18"
-                        gct -s -t string /desktop/gnome/interface/font_name "sans 18"
-                        gct -s -t string /apps/metacity/general/theme Atlanta
-                        gct -s -t string /desktop/gnome/background/picture_filename ""
-                        gct -s -t string /desktop/gnome/background/picture_options none
-                        gct -s -t string /desktop/gnome/background/primary_color \#666666
-                        gct -s -t string /desktop/gnome/background/secondary_color \#7F7F7F
-                        gct -s -t string /desktop/gnome/background/color_shading_type solid
-                        gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48
-                        gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/
-                        if [ -d /target/usr/share/xubuntu-default-settings/accessibility ]; then
-                            cp -a /target/usr/share/xubuntu-default-settings/accessibility/* /target/etc/xdg/
-                        fi
-                        ;;
-                        # Moderate Visual Impairment
-                        access=v2)
-                        gct -s -t bool /desktop/gnome/interface/accessibility true
-                        gct -s -t bool /apps/gksu/disable-grab true
-                        gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
-                        gct -s -t bool /desktop/gnome/applications/at/visual/startup true
-                        gct -s -t string /desktop/gnome/applications/at/visual/exec orca
-
-                        if [ -d /usr/share/xubuntu-default-settings ]; then
-                          apt-install gnome-orca gnome-mag
-                        fi
-
-			if [ -x /target/usr/bin/orca ]; then
-				if [ -f /home/$USERNAME/.orca/user-settings.py ]; then
-					cp -r /home/$USERNAME/.orca /target/home/$TARGET_USERNAME/
-					chroot /target chown -R $TARGET_USERNAME.$TARGET_USERNAME /home/$TARGET_USERNAME/.orca
-				else
-					mkdir -p /target/home/$TARGET_USERNAME/.orca
-					echo "import orca.settings" >> /target/home/$TARGET_USERNAME/.orca/user-settings.py
-					echo "orca.settings.enableSpeech = True" >> /target/home/$TARGET_USERNAME/.orca/user-settings.py
-					echo "orca.settings.enableMagnifier = True" >> /target/home/$TARGET_USERNAME/.orca/user-settings.py
-					chroot /target chown -R $TARGET_USERNAME.$TARGET_USERNAME /home/$TARGET_USERNAME/.orca
-				fi
-			fi
-                        sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /target/etc/sudoers
-
-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-impairment/
-                        ;;
-                        # Blindness
-                        access=v3)
-                        gct -s -t bool /desktop/gnome/interface/accessibility true
-                        gct -s -t bool /apps/gksu/disable-grab true
-                        gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
-                        gct -s -t bool /desktop/gnome/applications/at/visual/startup true
-                        gct -s -t string /desktop/gnome/applications/at/visual/exec orca
-                        remove_applet fast_user_switch
-			if [ -x /target/usr/bin/pulse-session ]; then
-				mkdir -p /target/var/lib/pulseaudio
-				touch /target/var/lib/pulseaudio/pulse_a11y_nostart
-				chroot /target chown root.root /var/lib/pulseaudio/pulse_a11y_nostart
-				mkdir -p /target/home/$TARGET_USERNAME/.pulse
-				echo "autospawn = no" > /target/home/$TARGET_USERNAME/.pulse/client.conf
-				chroot /target chown -R $TARGET_USERNAME.$TARGET_USERNAME /home/$TARGET_USERNAME/.pulse
-			fi
-                        sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /target/etc/sudoers
-			if [ -x /target/usr/bin/orca ]; then
-				if [ -f /home/$USERNAME/.orca/user-settings.py ]; then
-					cp -r /home/$USERNAME/.orca /target/home/$TARGET_USERNAME/
-					chroot /target chown -R $TARGET_USERNAME.$TARGET_USERNAME /home/$TARGET_USERNAME/.orca
-				else
-					mkdir -p /target/home/$TARGET_USERNAME/.orca
-					chroot /target chown -R $TARGET_USERNAME.$TARGET_USERNAME /home/$TARGET_USERNAME/.orca
-				fi
-			fi
-
-                        if [ -d /usr/share/xubuntu-default-settings ]; then
-                          apt-install gnome-orca
-                        fi
-                        ;;
-                        # Braille
-                        braille=ask)
-                        gct -s -t bool /desktop/gnome/interface/accessibility true
-                        gct -s -t bool /desktop/gnome/applications/at/visual/startup true
-                        gct -s -t string /desktop/gnome/applications/at/visual/exec orca
-                        if [ -x /target/usr/bin/orca ]; then
-				if [ -f /home/$USERNAME/.orca/user-settings.py ]; then
-					cp -r /home/$USERNAME/.orca /target/home/$TARGET_USERNAME/
-					chroot /target chown -R $TARGET_USERNAME.$TARGET_USERNAME /home/$TARGET_USERNAME/.orca
-				else
-	                                mkdir -p /target/home/$TARGET_USERNAME/.orca
-					echo "import orca.settings" >> /target/home/$TARGET_USERNAME/.orca/user-settings.py
-	                                echo "orca.settings.enableSpeech = False" >> /target/home/$TARGET_USERNAME/.orca/user-settings.py
-	                                echo "orca.settings.enableBraille = True" >> /target/home/$TARGET_USERNAME/.orca/user-settings.py
-					chroot /target chown -R $TARGET_USERNAME.$TARGET_USERNAME /home/$TARGET_USERNAME/.orca
-				fi
-                        fi
-                        gct -s -t bool /apps/gksu/disable-grab true
-                        gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
-                        remove_applet fast_user_switch
-                        sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /target/etc/sudoers
-			if [ -x /target/usr/bin/pulse-session ]; then
-				mkdir -p /target/var/lib/pulseaudio
-				touch /target/var/lib/pulseaudio/pulse_a11y_nostart
-				chroot /target chown root.root /var/lib/pulseaudio/pulse_a11y_nostart
-				mkdir -p /target/home/$TARGET_USERNAME/.pulse
-				echo "autospawn = no" > /target/home/$TARGET_USERNAME/.pulse/client.conf
-				chroot /target chown -R $TARGET_USERNAME.$TARGET_USERNAME /home/$TARGET_USERNAME/.pulse
-			fi
-                        ;;
-                        # Minor Motor Difficulties
-                        access=m1)
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/mousekeys_enable true
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_enable true
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep true
-                        gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
-                        gct -s -t bool /desktop/gnome/peripherals/keyboard/repeat true
-                        gct -s -t int /desktop/gnome/peripherals/keyboard/delay 700
-                        gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10
-                        gct -s -t bool /apps/gksu/disable-grab true
-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/
-                        if [ -e /target/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
-                            sed -i 's/0/1/' /target/etc/xdg/xfce4/mcs_settings/keyboard.xml
-                        fi
-                        ;;
-                        # Motor Difficulties - pointing devices
-                        access=m2)
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
-			gct -s -t bool /desktop/gnome/interface/accessibility true
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_enable true
-                        gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep false
-                        gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
-                        gct -s -t bool /desktop/gnome/applications/at/mobility/startup true
-                        gct -s -t string /desktop/gnome/applications/at/mobility/exec onboard
-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/
-                        if [ -e /target/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
-                            sed -i '/Sticky/ s/0/1/' /target/etc/xdg/xfce4/mcs_settings/keyboard.xml
-                        fi
+	case $x in
+		# Lesser Visual Impairment
+		access=v1)
+			/usr/bin/casper-a11y-enable -login -user="$TARGET_USERNAME" -chroot=/target -script high-contrast
+			exit
+                        ;;
+		# Moderate Visual Impairment
+		access=v2)
+			/usr/bin/casper-a11y-enable -login -user="$TARGET_USERNAME" -chroot=/target -script magnifier
+			exit
+                        ;;
+		# Blindness
+		access=v3)
+			copy_orca_config
+			/usr/bin/casper-a11y-enable -login -user="$TARGET_USERNAME" -chroot=/target -script blindness
+			exit
+                        ;;
+		# Braille
+		braille=ask)
+			copy_orca_config
+			/usr/bin/casper-a11y-enable -login -user="$TARGET_USERNAME" -chroot=/target -script braille
+			exit
+                        ;;
+		# Minor Motor Difficulties
+		access=m1)
+			/usr/bin/casper-a11y-enable -login -user="$TARGET_USERNAME" -chroot=/target -script keyboard-modifiers
+			exit
+                        ;;
+		# Motor Difficulties - pointing devices
+		access=m2)
+			/usr/bin/casper-a11y-enable -login -user="$TARGET_USERNAME" -chroot=/target -script onscreen-keyboard
+			exit
                         ;;
 		esac
 done
+
+if [ -z "$UBIQUITY_A11Y_PROFILE" ] && [ -f /tmp/casper-a11y.conf ]; then
+	. /tmp/casper-a11y.conf
+fi
+
+case "$UBIQUITY_A11Y_PROFILE" in
+	# Lesser Visual Impairment
+	high-contrast)
+		/usr/bin/casper-a11y-enable -login -user="$TARGET_USERNAME" -chroot=/target -script high-contrast
+		;;
+	# Moderate Visual Impairment
+	magnifier)
+		/usr/bin/casper-a11y-enable -login -user="$TARGET_USERNAME" -chroot=/target -script magnifier
+		;;
+	# Blindness
+	screen-reader)
+		copy_orca_config
+		/usr/bin/casper-a11y-enable -login -user="$TARGET_USERNAME" -chroot=/target -script blindness
+		;;
+	# Braille
+	braille)
+		copy_orca_config
+		/usr/bin/casper-a11y-enable -login -user="$TARGET_USERNAME" -chroot=/target -script braille
+		;;
+	# Minor Motor Difficulties
+	keyboard-modifiers)
+		/usr/bin/casper-a11y-enable -login -user="$TARGET_USERNAME" -chroot=/target -script keyboard-modifiers
+		;;
+	# Motor Difficulties - pointing devices
+	onscreen-keyboard)
+		/usr/bin/casper-a11y-enable -login -user="$TARGET_USERNAME" -chroot=/target -script onscreen-keyboard
+		;;
+esac
+
 
=== removed file 'ubiquity-hooks/48enable_kubuntu_netbook'
--- ubiquity-hooks/48enable_kubuntu_netbook	2010-01-27 14:01:22 +0000
+++ ubiquity-hooks/48enable_kubuntu_netbook	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-#! /bin/sh
-set -e
-
-if [ -e "/target/usr/share/autostart/plasma-netbook.desktop" ]; then
-    sed -i "s,Hidden=true,," /target/usr/share/autostart/plasma-netbook.desktop
-fi
-
-exit 0
 
=== added file 'ubiquity-hooks/49kubuntu_gnome_icon_cache'
--- ubiquity-hooks/49kubuntu_gnome_icon_cache	1970-01-01 00:00:00 +0000
+++ ubiquity-hooks/49kubuntu_gnome_icon_cache	2011-10-06 10:04:28 +0000
@@ -0,0 +1,11 @@
+#! /bin/sh
+set -e
+
+# livecd-rootfs deletes the Gnome icon cache for Kubuntu CDs to save space, recreate it here
+
+if [ -e "/target/usr/share/kubuntu-default-settings/" ] && [ -e "/target/usr/bin/gtk-update-icon-cache" ]; then
+    chroot /target gtk-update-icon-cache /usr/share/icons/hicolor
+    chroot /target gtk-update-icon-cache /usr/share/icons/oxygen
+fi
+
+exit 0