Merge lp:~jamiebennett/casper/debconf-speedup-work into lp:casper

[Jamie Bennett]

[Jamie Bennett (jamiebennett)]

Investigations into speeding up the casper boot process revealed that a significant proportion of time was spent in debconf-communicate calls. To solve this, one persistent debconf-communicate call is made with subsequent scripts using the confmodule approach.

Also in this branch is a quicker way to disable the guest user account.

[Colin Watson (cjwatson)]

You have two sets of merge conflicts in here (I'm surprised bzr let you commit those without some effort, actually). Could you please resolve them?

review: Needs Fixing

[Colin Watson (cjwatson)]

Also, the version number should be 1.212 rather than 1.211ubuntu1 - and since this is associated with a bug report, it would be best to close that in the changelog in the usual way.

[James Westby (james-w)]

On Wed, 03 Feb 2010 23:38:26 -0000, Colin Watson <email address hidden> wrote:
> Review: Needs Fixing
> You have two sets of merge conflicts in here (I'm surprised bzr let you commit those without some effort, actually). Could you please resolve them?

The diff it is showing is the diff that would result if you did the
merge, so are the conflicts just conflicts between this branch and the
target?

Thanks,

James

[Colin Watson (cjwatson)]

Yes, you're right. Sorry about that. I'll merge this now, then.

review: Approve

=== modified file 'bin/casper-preseed'
--- bin/casper-preseed	2006-10-16 15:05:58 +0000
+++ bin/casper-preseed	2010-02-03 20:58:09 +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	2010-02-03 20:58:09 +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 'debian/casper.install'
--- debian/casper.install	2009-09-23 14:21:43 +0000
+++ debian/casper.install	2010-02-03 20:58:09 +0000
@@ -3,6 +3,7 @@
 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
 hooks				usr/share/initramfs-tools
 scripts				usr/share/initramfs-tools

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-27 13:56:03 +0000
+++ debian/changelog	2010-02-03 20:58:09 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 casper (1.211) UNRELEASED; urgency=low
 
   [ Mario Limonciello ]
@@ -12,6 +13,18 @@
 
  -- Jonathan Riddell <[e-mail]>  Wed, 27 Jan 2010 13:55:42 +0000
 
+=======
+casper (1.211ubuntu1) lucid; urgency=low
+
+  * 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.
+
+ -- Jamie Bennett <[e-mail]>  Wed, 03 Feb 2010 12:37:53 -0800
+
+>>>>>>> MERGE-SOURCE
 casper (1.210) lucid; urgency=low
 
   [ Scott James Remnant ]

=== modified file 'debian/copyright'
--- debian/copyright	2009-01-13 18:56:31 +0000
+++ debian/copyright	2010-02-03 20:58:09 +0000
@@ -28,6 +28,16 @@
 	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]>

=== modified file 'hooks/casper'
--- hooks/casper	2009-05-23 22:30:56 +0000
+++ hooks/casper	2010-02-03 20:58:09 +0000
@@ -33,6 +33,7 @@
 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
 copy_exec /lib/udev/cdrom_id /lib/udev

=== modified file 'scripts/casper'
--- scripts/casper	2009-10-06 12:07:52 +0000
+++ scripts/casper	2010-02-03 20:58:09 +0000
@@ -651,6 +651,27 @@
         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
+
+    chroot /root debconf-communicate -fnoninteractive casper > /tmp/debconf-out.fifo < /tmp/debconf-in.fifo &
+
+    # Save the PID so it can be killed later.
+    DEBCONF_COMMUNICATE_PID="$!"
+
+    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 +682,13 @@
         umount "${rootmnt}/dev"
     fi
 
+    # Kill the debconf-communicate instance and close fd's associated with 
+    # debconf-communicate.
+    kill $DEBCONF_COMMUNICATE_PID
+    exec 3>&- 4>&-
+    rm -f /tmp/debconf-in.fifo
+    rm -f /tmp/debconf-out.fifo
+
     exec 1>&6 6>&-
     exec 2>&7 7>&-
     kill "$tailpid"

=== modified file 'scripts/casper-bottom/10adduser'
--- scripts/casper-bottom/10adduser	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/10adduser	2010-02-03 20:58:09 +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

=== modified file 'scripts/casper-bottom/22sslcert'
--- scripts/casper-bottom/22sslcert	2010-01-05 16:54:40 +0000
+++ scripts/casper-bottom/22sslcert	2010-02-03 20:58:09 +0000
@@ -17,6 +17,7 @@
 esac
 
 . /scripts/casper-functions
+load_confmodule
 
 log_begin_msg "$DESCRIPTION"
 

=== modified file 'scripts/casper-bottom/24preseed'
--- scripts/casper-bottom/24preseed	2010-01-20 23:33:29 +0000
+++ scripts/casper-bottom/24preseed	2010-02-03 20:58:09 +0000
@@ -17,11 +17,12 @@
 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
 
 locations=
@@ -64,16 +65,19 @@
 	esac
 done
 
+<<<<<<< TREE
 if [ "$locations" ]; then
 	for item in $locations; do
 		chroot /root debconf-set-selections < "/root$item"
 	done
+=======
+if [ "$location" ]; then
+	casper-set-selections "/root$location"
+>>>>>>> MERGE-SOURCE
 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
+	sh -c "$RET"
 fi
 
 # Clear out debconf database backup files to save memory.

=== modified 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	2010-02-03 20:58:09 +0000
@@ -20,6 +20,6 @@
 
 log_begin_msg "$DESCRIPTION"
 
-chroot /root dpkg -P gdm-guest-session || true
+chroot /root rm -r /usr/share/gdm/guest-session
 
 log_end_msg

=== modified file 'scripts/casper-functions'
--- scripts/casper-functions	2008-09-18 23:39:20 +0000
+++ scripts/casper-functions	2010-02-03 20:58:09 +0000
@@ -39,3 +39,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
+}