--- old/usr/src/cmd/svc/milestone/devices-local	Tue Feb  3 13:17:12 2009
+++ new/usr/src/cmd/svc/milestone/devices-local	Tue Feb  3 13:17:11 2009
@@ -20,14 +20,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T.
 # All rights reserved.
 #
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
 
 # Initiate the device reconfiguration process in case we need some
 # device links established so that we can successfully perform our
@@ -82,6 +80,7 @@
 
 # Create any zvol devices
 if [ -x /usr/sbin/zfs ]; then
+	/usr/sbin/zpool key -l -a
 	/usr/sbin/zfs volinit || exit $SMF_EXIT_ERR_FATAL
 	#
 	# Add swap again to allow for swapping to zvols.