c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 03:09:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

zpool import -t should not update cachefile

Browse Source 
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 <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #2417
This commit is contained in:
Richard Yao 2014-06-23 14:26:47 -04:00 committed by Brian Behlendorf
parent 2f3ec90061
commit 00d2a8c92f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/zpool/zpool_main.c
View File

@ -2085,6 +2085,9 @@ zpool_do_import(int argc, char **argv)
break; break;
case 't': case 't':
flags |= ZFS_IMPORT_TEMP_NAME; flags |= ZFS_IMPORT_TEMP_NAME;
if (add_prop_list_default(zpool_prop_to_name(
ZPOOL_PROP_CACHEFILE), "none", &props, B_TRUE))
goto error;
break; break;
case 'T': case 'T':

2
man/man8/zpool.8
View File

@ -1503,7 +1503,7 @@ Specify the txg to use for rollback. Implies \fB-FX\fR. For more details about
.ad .ad
.sp .6 .sp .6
.RS 4n .RS 4n
Used with "\fBnewpool\fR". Specifies that "\fBnewpool\fR" 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. Used with "\fBnewpool\fR". Specifies that "\fBnewpool\fR" 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 -o cachefile=none when not explicitly specified.
.RE .RE
.sp .sp