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 2171)
+++ 	(revision )
@@ -1,19 +1,0 @@
-#!/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/debian.d/96-clear-root-password
===================================================================
--- trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/debian.d/96-clear-root-password	(revision 2172)
+++ trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/debian.d/96-clear-root-password	(revision 2172)
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+#  This script unsets the root password, so the VM owner can log in at
+#  the console.
+#
+#  Must come after 95-install-base-system, since that disables root's password.
+#
+
+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/debian/changelog
===================================================================
--- trunk/packages/invirt-autoinstaller/debian/changelog	(revision 2171)
+++ trunk/packages/invirt-autoinstaller/debian/changelog	(revision 2172)
@@ -2,4 +2,5 @@
 
   * Renumber our 9x-* hook scripts to make some room.
+  * Move 36-clear-root-password to 96- so it sticks.
 
  -- Greg Price <price@mit.edu>  Thu, 19 Feb 2009 03:03:39 -0500