@@ -18,18 +18,16 @@
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # 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
 # remaining standard mounts.
 

@@ -80,10 +78,11 @@
         fi
 fi
 
 # 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.
        #
        /sbin/swapadd