folkslinux
/
zfs
mirror of https://github.com/openzfs/zfs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix zpool_add_005_pos 

Under Linux the existence of a block device in /etc/fstab is
not sufficient to prevent the use of the force flag.  Without
the force flag a warning will be printed that the device has
a filesystem of a given type.  Providing the force option
will overwrite that filesystem as long as it is not actively
mounted.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Tested-by: bunder2015 <omfgbunder@gmail.com>
Signed-off-by: bunder2015 <omfgbunder@gmail.com>
Closes #6267 
Closes #6272
This commit is contained in:
bunder2015 2017-06-27 13:06:07 -04:00 committed by Brian Behlendorf
parent 58404a73db
commit 47770d30f2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_005_pos.ksh
View File

@ -80,7 +80,11 @@ log_must poolexists "$TESTPOOL1"
unset NOINUSE_CHECK unset NOINUSE_CHECK
log_mustnot zpool add -f "$TESTPOOL" ${disk}${SLICE_PREFIX}${SLICE1} log_mustnot zpool add -f "$TESTPOOL" ${disk}${SLICE_PREFIX}${SLICE1}
log_mustnot zpool add -f "$TESTPOOL" $mnttab_dev log_mustnot zpool add -f "$TESTPOOL" $mnttab_dev
log_mustnot zpool add -f "$TESTPOOL" $vfstab_dev if is_linux; then
log_mustnot zpool add "$TESTPOOL" $vfstab_dev
else
log_mustnot zpool add -f "$TESTPOOL" $vfstab_dev
fi
if ! is_linux; then if ! is_linux; then
log_must echo "y" | newfs ${DEV_DSKDIR}/$dump_dev > /dev/null 2>&1 log_must echo "y" | newfs ${DEV_DSKDIR}/$dump_dev > /dev/null 2>&1