Rebase to OpenSolaris b103, in the process we are removing any code which did not...

[mirror_zfs-debian.git] / zfs / zcmd / zpool / zpool_vdev.c

diff --git a/zfs/zcmd/zpool/zpool_vdev.c b/zfs/zcmd/zpool/zpool_vdev.c
index 82410062457329463f8b39257dc93220c567d793..10007c14927f6961051c68e0eed420e6e958b454 100644 (file)
--- a/zfs/zcmd/zpool/zpool_vdev.c
+++ b/zfs/zcmd/zpool/zpool_vdev.c
@@ -20,12 +20,10 @@
  */
 
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident  "@(#)zpool_vdev.c       1.15    07/11/09 SMI"
-
 /*
  * Functions to convert between a list of vdevs and an nvlist representing the
  * configuration.  Each entry in the list can be one of:
@@ -1352,7 +1350,7 @@ construct_spec(int argc, char **argv)
  */
 nvlist_t *
 make_root_vdev(zpool_handle_t *zhp, int force, int check_rep,
-    boolean_t isreplacing, int argc, char **argv)
+    boolean_t isreplacing, boolean_t dryrun, int argc, char **argv)
 {
        nvlist_t *newroot;
        nvlist_t *poolconfig = NULL;
@@ -1394,7 +1392,7 @@ make_root_vdev(zpool_handle_t *zhp, int force, int check_rep,
        /*
         * Run through the vdev specification and label any whole disks found.
         */
-       if (make_disks(zhp, newroot) != 0) {
+       if (!dryrun && make_disks(zhp, newroot) != 0) {
                nvlist_free(newroot);
                return (NULL);
        }