diff options
| author | Richard Yao <[email protected]> | 2014-06-23 14:26:47 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-09-30 10:46:58 -0700 |
| commit | 00d2a8c92f614f49d23dea5d73f7ea7eb489ccf1 (patch) | |
| tree | 5d987676f4bd880661b820ef583cd8bd4abdbe54 /cmd/zpool | |
| parent | 2f3ec9006146844af6763d1fa4e823fd9047fd54 (diff) | |
zpool import -t should not update cachefile
zpool import's -t parameter is intended for use with -R when operating
on pools that belong to other systems. Like -R, pools imported in this
way should not update the cachefile unless explicitly requested. The
initial implementation allowed the cachefile to be updated when -R was
not used. This went uncaught during testing because -R had implicitly
disabled use of the cachefile.
Signed-off-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #2417
Diffstat (limited to 'cmd/zpool')
| -rw-r--r-- | cmd/zpool/zpool_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c index d6fa8a829..13577d13c 100644 --- a/cmd/zpool/zpool_main.c +++ b/cmd/zpool/zpool_main.c @@ -2085,6 +2085,9 @@ zpool_do_import(int argc, char **argv) break; case 't': flags |= ZFS_IMPORT_TEMP_NAME; + if (add_prop_list_default(zpool_prop_to_name( + ZPOOL_PROP_CACHEFILE), "none", &props, B_TRUE)) + goto error; break; case 'T': |