--- d-i/source/user-setup/user-setup-apply	2010-06-03 12:30:15.000000000 +0200
+++ /home/arthur/user-setup-apply	2010-06-03 12:30:16.000000000 +0200
@@ -156,13 +156,13 @@
 			mount --bind /dev $ROOT/dev
 			umountdev=:
 		fi
-		if ! $log $chroot $ROOT ecryptfs-setup-swap -f -n; then
-			echo "ecryptfs-setup-swap failed." >&2
-			db_input critical user-setup/encrypt-home-failed || true
-			db_go || true
-			ENCRYPT_HOME="false"
-			ENCRYPT_HOME_OPT=
-		fi
+		#if ! $log $chroot $ROOT ecryptfs-setup-swap -f -n; then
+		#	echo "ecryptfs-setup-swap failed." >&2
+		#	db_input critical user-setup/encrypt-home-failed || true
+		#	db_go || true
+		#	ENCRYPT_HOME="false"
+		#	ENCRYPT_HOME_OPT=
+		#fi
 		if $umountproc; then
 			$log $chroot $ROOT umount /proc
 		fi
@@ -186,12 +186,25 @@
 		ENCRYPT_HOME_OPT=
 	fi
 
+	umountproc=false
+	umountdev=false
+	if [ ! -e $ROOT/proc/cmdline ]; then
+		$log $chroot $ROOT mount -t proc proc /proc
+		umountproc=:
+	fi
+	if [ ! -e $ROOT/dev/urandom ]; then
+		mount --bind /dev $ROOT/dev
+		umountdev=:
+	fi
 	umountsys=false
 	if [ -n "$ENCRYPT_HOME_OPT" ]; then
 		if [ ! -e $ROOT/sys/kernel ]; then
 			$log $chroot $ROOT mount -t sysfs sysfs /sys
 			umountsys=:
 		fi
+                if [ ! -d $ROOT/dev/shm ]; then
+                        $log $chroot $ROOT mkdir /dev/shm
+                fi
 		$log $chroot $ROOT mount -t tmpfs tmpfs /dev/shm
 	fi
 	if [ -x $ROOT/usr/sbin/adduser ]; then
@@ -212,6 +225,13 @@
 		$log $chroot $ROOT umount /dev/shm
 	fi
 
+	if $umountproc; then
+		$log $chroot $ROOT umount /proc
+	fi
+	if $umountdev; then
+		umount $ROOT/dev
+	fi
+
 	if [ "$HOME_EXISTED" ]; then
 		# The user's home directory already existed before we called
 		# adduser. This often means that a mount point under