Index: trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/debian.d/36-clear-root-password
===================================================================
--- trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/debian.d/36-clear-root-password	(revision 2169)
+++ trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/debian.d/36-clear-root-password	(revision 2169)
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+#  This script unsets the root password, so the VM owner can log in at
+#  the console.
+#
+
+prefix=$1
+
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    . ./hooks/common.sh
+fi
+
+logMessage Script $0 starting
+
+chroot ${prefix} passwd root -d
+
+logMessage Script $0 finished
Index: trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/edgy.d/36-clear-root-password
===================================================================
--- trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/edgy.d/36-clear-root-password	(revision 2169)
+++ trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/edgy.d/36-clear-root-password	(revision 2169)
@@ -0,0 +1,1 @@
+link ../debian.d/36-clear-root-password
Index: trunk/packages/invirt-autoinstaller/debian/changelog
===================================================================
--- trunk/packages/invirt-autoinstaller/debian/changelog	(revision 2167)
+++ trunk/packages/invirt-autoinstaller/debian/changelog	(revision 2169)
@@ -1,2 +1,10 @@
+invirt-autoinstaller (0.0.17) unstable; urgency=low
+
+  * Unset root password in xen-create-image.
+  * Don't bother unsetting the password in the installer image, because it
+    doesn't actually affect the guest.
+
+ -- Greg Price <price@mit.edu>  Wed, 18 Feb 2009 22:12:26 -0500
+
 invirt-autoinstaller (0.0.16) unstable; urgency=low
 
Index: trunk/packages/invirt-autoinstaller/debian/invirt-autoinstaller-guest.postinst
===================================================================
--- trunk/packages/invirt-autoinstaller/debian/invirt-autoinstaller-guest.postinst	(revision 2167)
+++ 	(revision )
@@ -1,15 +1,0 @@
-#!/bin/sh
-
-case "$1" in
-  configure)
-    passwd root -d
-    ;;
-  *)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
