5882 Temporary pool names
Reviewed by: Matt Ahrens <matt@delphix.com>
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Reviewed by: John Kennedy <john.kennedy@delphix.com>
Approved by: Dan McDonald <danmcd@joyent.com>

@@ -8,20 +8,21 @@
      zpool add [-fn] pool vdev...
      zpool attach [-f] pool device new_device
      zpool checkpoint [-d, --discard] pool
      zpool clear pool [device]
      zpool create [-dfn] [-B] [-m mountpoint] [-o property=value]...
-           [-O file-system-property=value]... [-R root] pool vdev...
+           [-O file-system-property=value]... [-R root] [-t tempname]
+           pool vdev...
      zpool destroy [-f] pool
      zpool detach pool device
      zpool export [-f] pool...
      zpool get [-Hp] [-o field[,field]...] all|property[,property]... pool...
      zpool history [-il] [pool]...
      zpool import [-D] [-d dir]
      zpool import -a [-DfmN] [-F [-n]] [-c cachefile|-d dir] [-o mntopts]
            [-o property=value]... [-R root]
-     zpool import [-Dfm] [-F [-n]] [--rewind-to-checkpoint]
+     zpool import [-Dfmt] [-F [-n]] [--rewind-to-checkpoint]
            [-c cachefile|-d dir] [-o mntopts] [-o property=value]... [-R root]
            pool|id [newpool]
      zpool initialize [-cs] pool [device...]
      zpool iostat [-v] [-T u|d] [pool]... [interval [count]]
      zpool labelclear [-f] device

@@ -538,11 +539,12 @@
              all device errors within the pool are cleared.  If one or more
              devices is specified, only those errors associated with the
              specified device or devices are cleared.
 
      zpool create [-dfn] [-B] [-m mountpoint] [-o property=value]... [-O
-             file-system-property=value]... [-R root] pool vdev...
+             file-system-property=value]... [-R root] [-t tempname] pool
+             vdev...
              Creates a new storage pool containing the virtual devices
              specified on the command line.  The pool name must begin with a
              letter, and can only contain alphanumeric characters as well as
              underscore ("_"), dash ("-"), and period (".").  The pool names
              mirror, raidz, spare and log are reserved, as are names beginning

@@ -608,10 +610,19 @@
                      zfs(1M) for a list of valid properties that can be set.
 
              -R root
                      Equivalent to -o cachefile=none -o altroot=root
 
+             -t tempname
+                     Sets the in-core pool name to tempname while the on-disk
+                     name will be the name specified as the pool name pool.
+                     This will set the default cachefile property to none.
+                     This is intended to handle name space collisions when
+                     creating pools for other systems, such as virtual
+                     machines or physical machines whose pools live on network
+                     block devices.
+
      zpool destroy [-f] pool
              Destroys the given pool, freeing up any devices for other use.
              This command tries to unmount any active datasets before
              destroying the pool.
 

@@ -761,11 +772,11 @@
 
              -R root
                      Sets the cachefile property to none and the altroot
                      property to root.
 
-     zpool import [-Dfm] [-F [-n]] [--rewind-to-checkpoint] [-c cachefile|-d
+     zpool import [-Dfmt] [-F [-n]] [--rewind-to-checkpoint] [-c cachefile|-d
              dir] [-o mntopts] [-o property=value]... [-R root] pool|id
              [newpool]
              Imports a specific pool.  A pool can be identified by its name or
              the numeric identifier.  If newpool is specified, the pool is
              imported using the name newpool.  Otherwise, it is imported with

@@ -821,10 +832,16 @@
 
              -R root
                      Sets the cachefile property to none and the altroot
                      property to root.
 
+             -t      Used with newpool.  Specifies that newpool is temporary.
+                     Temporary pool names last until export.  Ensures that the
+                     original pool name will be used in all label updates and
+                     therefore is retained upon export.  Will also set
+                     cachefile property to none when not explicitly specified.
+
              --rewind-to-checkpoint
                      Rewinds pool to the checkpointed state.  Once the pool is
                      imported with this flag there is no way to undo the
                      rewind.  All changes and data that were written after the
                      checkpoint are lost!  The only exception is when the