Fix some typos
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed by: George Melikov <mail@gmelikov.ru> Signed-off-by: John Eismeier <john.eismeier@gmail.com> Closes #7237
This commit is contained in:
parent
d72cd017dd
commit
d699aaef09
|
@ -280,7 +280,7 @@ def init():
|
||||||
"outfile",
|
"outfile",
|
||||||
"help",
|
"help",
|
||||||
"verbose",
|
"verbose",
|
||||||
"seperator",
|
"separator",
|
||||||
"columns"
|
"columns"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
@ -299,7 +299,7 @@ def init():
|
||||||
hflag = True
|
hflag = True
|
||||||
if opt in ('-v', '--verbose'):
|
if opt in ('-v', '--verbose'):
|
||||||
vflag = True
|
vflag = True
|
||||||
if opt in ('-s', '--seperator'):
|
if opt in ('-s', '--separator'):
|
||||||
sep = arg
|
sep = arg
|
||||||
i += 1
|
i += 1
|
||||||
if opt in ('-f', '--columns'):
|
if opt in ('-f', '--columns'):
|
||||||
|
|
|
@ -529,7 +529,7 @@ def main():
|
||||||
"help",
|
"help",
|
||||||
"infile",
|
"infile",
|
||||||
"outfile",
|
"outfile",
|
||||||
"seperator",
|
"separator",
|
||||||
"types",
|
"types",
|
||||||
"verbose",
|
"verbose",
|
||||||
"extended",
|
"extended",
|
||||||
|
@ -555,7 +555,7 @@ def main():
|
||||||
ofile = arg
|
ofile = arg
|
||||||
if opt in ('-r', '--raw'):
|
if opt in ('-r', '--raw'):
|
||||||
raw += 1
|
raw += 1
|
||||||
if opt in ('-s', '--seperator'):
|
if opt in ('-s', '--separator'):
|
||||||
sep = arg
|
sep = arg
|
||||||
if opt in ('-t', '--types'):
|
if opt in ('-t', '--types'):
|
||||||
tflag = True
|
tflag = True
|
||||||
|
|
|
@ -478,7 +478,7 @@ destroy_fs()
|
||||||
echo "Message: $ZFS_STDERR"
|
echo "Message: $ZFS_STDERR"
|
||||||
echo "Error: $ZFS_ERROR"
|
echo "Error: $ZFS_ERROR"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Failed to destroy '$fs'. Please make sure that '$fs' is not availible."
|
echo "Failed to destroy '$fs'. Please make sure that '$fs' is not available."
|
||||||
echo "Hint: Try: zfs destroy -Rfn $fs"
|
echo "Hint: Try: zfs destroy -Rfn $fs"
|
||||||
echo "If this dryrun looks good, then remove the 'n' from '-Rfn' and try again."
|
echo "If this dryrun looks good, then remove the 'n' from '-Rfn' and try again."
|
||||||
/bin/sh
|
/bin/sh
|
||||||
|
|
|
@ -729,7 +729,7 @@ man page. In order to enable this property each host must set a unique hostid.
|
||||||
See
|
See
|
||||||
.Xr genhostid 1
|
.Xr genhostid 1
|
||||||
.Xr zgenhostid 8
|
.Xr zgenhostid 8
|
||||||
.Xr spl-module-paramters 5
|
.Xr spl-module-parameters 5
|
||||||
for additional details. The default value is
|
for additional details. The default value is
|
||||||
.Sy off .
|
.Sy off .
|
||||||
.It Sy version Ns = Ns Ar version
|
.It Sy version Ns = Ns Ar version
|
||||||
|
|
|
@ -60,7 +60,7 @@ prepare $DNAME "tar cf $TESTDIR/tar$$.tar $BNAME"
|
||||||
(( $? != 0 )) && log_fail "Unable to create src archive"
|
(( $? != 0 )) && log_fail "Unable to create src archive"
|
||||||
|
|
||||||
migrate $TESTDIR $SUMA $SUMB "tar xf $TESTDIR/tar$$.tar"
|
migrate $TESTDIR $SUMA $SUMB "tar xf $TESTDIR/tar$$.tar"
|
||||||
(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
|
(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
|
||||||
"ZFS fs to ZFS fs"
|
"ZFS fs to ZFS fs"
|
||||||
|
|
||||||
log_pass "Successully migrated test file from ZFS fs to ZFS fs".
|
log_pass "Successfully migrated test file from ZFS fs to ZFS fs".
|
||||||
|
|
|
@ -60,7 +60,7 @@ prepare $DNAME "tar cf $TESTDIR/tar$$.tar $BNAME"
|
||||||
(( $? != 0 )) && log_fail "Unable to create src archive"
|
(( $? != 0 )) && log_fail "Unable to create src archive"
|
||||||
|
|
||||||
migrate $NONZFS_TESTDIR $SUMA $SUMB "tar xf $TESTDIR/tar$$.tar"
|
migrate $NONZFS_TESTDIR $SUMA $SUMB "tar xf $TESTDIR/tar$$.tar"
|
||||||
(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
|
(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
|
||||||
"ZFS fs to UFS fs"
|
"ZFS fs to UFS fs"
|
||||||
|
|
||||||
log_pass "Successully migrated test file from ZFS fs to UFS fs".
|
log_pass "Successfully migrated test file from ZFS fs to UFS fs".
|
||||||
|
|
|
@ -60,7 +60,7 @@ prepare $DNAME "tar cf $NONZFS_TESTDIR/tar$$.tar $BNAME"
|
||||||
(( $? != 0 )) && log_fail "Unable to create src archive"
|
(( $? != 0 )) && log_fail "Unable to create src archive"
|
||||||
|
|
||||||
migrate $TESTDIR $SUMA $SUMB "tar xvf $NONZFS_TESTDIR/tar$$.tar"
|
migrate $TESTDIR $SUMA $SUMB "tar xvf $NONZFS_TESTDIR/tar$$.tar"
|
||||||
(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
|
(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
|
||||||
"UFS fs to ZFS fs"
|
"UFS fs to ZFS fs"
|
||||||
|
|
||||||
log_pass "Successully migrated test file from UFS fs to ZFS fs".
|
log_pass "Successfully migrated test file from UFS fs to ZFS fs".
|
||||||
|
|
|
@ -67,7 +67,7 @@ cd $cwd
|
||||||
(( $? != 0 )) && log_untested "Could not change directory to $cwd"
|
(( $? != 0 )) && log_untested "Could not change directory to $cwd"
|
||||||
|
|
||||||
migrate_cpio $TESTDIR "$TESTDIR/cpio$$.cpio" $SUMA $SUMB
|
migrate_cpio $TESTDIR "$TESTDIR/cpio$$.cpio" $SUMA $SUMB
|
||||||
(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
|
(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
|
||||||
"ZFS fs to ZFS fs"
|
"ZFS fs to ZFS fs"
|
||||||
|
|
||||||
log_pass "Successully migrated test file from ZFS fs to ZFS fs".
|
log_pass "Successfully migrated test file from ZFS fs to ZFS fs".
|
||||||
|
|
|
@ -67,7 +67,7 @@ cd $cwd
|
||||||
(( $? != 0 )) && log_untested "Could not change directory to $cwd"
|
(( $? != 0 )) && log_untested "Could not change directory to $cwd"
|
||||||
|
|
||||||
migrate_cpio $NONZFS_TESTDIR "$TESTDIR/cpio$$.cpio" $SUMA $SUMB
|
migrate_cpio $NONZFS_TESTDIR "$TESTDIR/cpio$$.cpio" $SUMA $SUMB
|
||||||
(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
|
(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
|
||||||
"ZFS fs to UFS fs"
|
"ZFS fs to UFS fs"
|
||||||
|
|
||||||
log_pass "Successully migrated test file from ZFS fs to UFS fs".
|
log_pass "Successfully migrated test file from ZFS fs to UFS fs".
|
||||||
|
|
|
@ -67,7 +67,7 @@ cd $cwd
|
||||||
(( $? != 0 )) && log_untested "Could not change directory to $cwd"
|
(( $? != 0 )) && log_untested "Could not change directory to $cwd"
|
||||||
|
|
||||||
migrate_cpio $TESTDIR "$NONZFS_TESTDIR/cpio$$.cpio" $SUMA $SUMB
|
migrate_cpio $TESTDIR "$NONZFS_TESTDIR/cpio$$.cpio" $SUMA $SUMB
|
||||||
(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
|
(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
|
||||||
"ZFS fs to ZFS fs"
|
"ZFS fs to ZFS fs"
|
||||||
|
|
||||||
log_pass "Successully migrated test file from UFS fs to ZFS fs".
|
log_pass "Successfully migrated test file from UFS fs to ZFS fs".
|
||||||
|
|
|
@ -60,7 +60,7 @@ prepare $DNAME "dd if=$BNAME obs=128k of=$TESTDIR/dd$$.dd"
|
||||||
(( $? != 0 )) && log_fail "Unable to create src archive"
|
(( $? != 0 )) && log_fail "Unable to create src archive"
|
||||||
|
|
||||||
migrate $TESTDIR $SUMA $SUMB "dd if=$TESTDIR/dd$$.dd obs=128k of=$BNAME"
|
migrate $TESTDIR $SUMA $SUMB "dd if=$TESTDIR/dd$$.dd obs=128k of=$BNAME"
|
||||||
(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
|
(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
|
||||||
"ZFS fs to ZFS fs"
|
"ZFS fs to ZFS fs"
|
||||||
|
|
||||||
log_pass "Successully migrated test file from ZFS fs to ZFS fs".
|
log_pass "Successfully migrated test file from ZFS fs to ZFS fs".
|
||||||
|
|
|
@ -60,7 +60,7 @@ prepare $DNAME "dd if=$BNAME obs=128k of=$TESTDIR/dd$$.dd"
|
||||||
(( $? != 0 )) && log_fail "Unable to create src archive"
|
(( $? != 0 )) && log_fail "Unable to create src archive"
|
||||||
|
|
||||||
migrate $NONZFS_TESTDIR $SUMA $SUMB "dd if=$TESTDIR/dd$$.dd obs=128k of=$BNAME"
|
migrate $NONZFS_TESTDIR $SUMA $SUMB "dd if=$TESTDIR/dd$$.dd obs=128k of=$BNAME"
|
||||||
(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
|
(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
|
||||||
"ZFS fs to ZFS fs"
|
"ZFS fs to ZFS fs"
|
||||||
|
|
||||||
log_pass "Successully migrated test file from ZFS fs to UFS fs".
|
log_pass "Successfully migrated test file from ZFS fs to UFS fs".
|
||||||
|
|
|
@ -60,7 +60,7 @@ prepare $DNAME "dd if=$BNAME obs=128k of=$NONZFS_TESTDIR/dd$$.dd"
|
||||||
(( $? != 0 )) && log_fail "Unable to create src archive"
|
(( $? != 0 )) && log_fail "Unable to create src archive"
|
||||||
|
|
||||||
migrate $TESTDIR $SUMA $SUMB "dd if=$NONZFS_TESTDIR/dd$$.dd obs=128k of=$BNAME"
|
migrate $TESTDIR $SUMA $SUMB "dd if=$NONZFS_TESTDIR/dd$$.dd obs=128k of=$BNAME"
|
||||||
(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
|
(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
|
||||||
"ZFS fs to ZFS fs"
|
"ZFS fs to ZFS fs"
|
||||||
|
|
||||||
log_pass "Successully migrated test file from UFS fs to ZFS fs".
|
log_pass "Successfully migrated test file from UFS fs to ZFS fs".
|
||||||
|
|
|
@ -60,7 +60,7 @@ prepare $DNAME "cp $BNAME $TESTDIR/cp$$.cp"
|
||||||
(( $? != 0 )) && log_fail "Unable to create src archive"
|
(( $? != 0 )) && log_fail "Unable to create src archive"
|
||||||
|
|
||||||
migrate $TESTDIR $SUMA $SUMB "cp $TESTDIR/cp$$.cp $BNAME"
|
migrate $TESTDIR $SUMA $SUMB "cp $TESTDIR/cp$$.cp $BNAME"
|
||||||
(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
|
(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
|
||||||
"ZFS fs to ZFS fs"
|
"ZFS fs to ZFS fs"
|
||||||
|
|
||||||
log_pass "Successully migrated test file from ZFS fs to ZFS fs".
|
log_pass "Successfully migrated test file from ZFS fs to ZFS fs".
|
||||||
|
|
|
@ -60,7 +60,7 @@ prepare $DNAME "cp $BNAME $TESTDIR/cp$$.cp"
|
||||||
(( $? != 0 )) && log_fail "Unable to create src archive"
|
(( $? != 0 )) && log_fail "Unable to create src archive"
|
||||||
|
|
||||||
migrate $NONZFS_TESTDIR $SUMA $SUMB "cp $TESTDIR/cp$$.cp $BNAME"
|
migrate $NONZFS_TESTDIR $SUMA $SUMB "cp $TESTDIR/cp$$.cp $BNAME"
|
||||||
(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
|
(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
|
||||||
"ZFS fs to UFS fs"
|
"ZFS fs to UFS fs"
|
||||||
|
|
||||||
log_pass "Successully migrated test file from ZFS fs to UFS fs".
|
log_pass "Successfully migrated test file from ZFS fs to UFS fs".
|
||||||
|
|
|
@ -60,7 +60,7 @@ prepare $DNAME "cp $BNAME $NONZFS_TESTDIR/cp$$.cp"
|
||||||
(( $? != 0 )) && log_fail "Unable to create src archive"
|
(( $? != 0 )) && log_fail "Unable to create src archive"
|
||||||
|
|
||||||
migrate $TESTDIR $SUMA $SUMB "cp $NONZFS_TESTDIR/cp$$.cp $BNAME"
|
migrate $TESTDIR $SUMA $SUMB "cp $NONZFS_TESTDIR/cp$$.cp $BNAME"
|
||||||
(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \
|
(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \
|
||||||
"UFS fs to ZFS fs"
|
"UFS fs to ZFS fs"
|
||||||
|
|
||||||
log_pass "Successully migrated test file from UFS fs to ZFS fs".
|
log_pass "Successfully migrated test file from UFS fs to ZFS fs".
|
||||||
|
|
Loading…
Reference in New Issue