diff options
| author | Ryan Moeller <ryan@iXsystems.com> | 2020-01-31 16:51:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-31 16:51:23 +0000 |
| commit | a3bddd49f8397b3e10872a793d60c8bbbdbe2a80 (patch) | |
| tree | a354b56374aeb3fe7121e856485869e7fed9aaca /tests/zfs-tests/include/default.cfg.in | |
| parent | 9d8ce2457d67e112552ac20b9408464bc246b727 (diff) | |
| download | src-a3bddd49f8397b3e10872a793d60c8bbbdbe2a80.tar.gz src-a3bddd49f8397b3e10872a793d60c8bbbdbe2a80.zip | |
ZTS: Fix a few defaults
Linux was missing a default value for DEV_DSKDIR. Set it to /dev.
Fix resulting fallout.
SLICE_PREFIX seems like a good candidate for including in the defaults.
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #9898
Diffstat (limited to 'tests/zfs-tests/include/default.cfg.in')
| -rw-r--r-- | tests/zfs-tests/include/default.cfg.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/zfs-tests/include/default.cfg.in b/tests/zfs-tests/include/default.cfg.in index 1281176cbabe..741c0d3b2c67 100644 --- a/tests/zfs-tests/include/default.cfg.in +++ b/tests/zfs-tests/include/default.cfg.in @@ -173,6 +173,7 @@ if is_linux; then ZVOL_DEVDIR="/dev/zvol" ZVOL_RDEVDIR="/dev/zvol" + DEV_DSKDIR="/dev" DEV_RDSKDIR="/dev" DEV_MPATHDIR="/dev/mapper" @@ -182,8 +183,8 @@ if is_linux; then VDEVID_CONF="$ZEDLET_DIR/vdev_id.conf" VDEVID_CONF_ETC="/etc/zfs/vdev_id.conf" - NEWFS_DEFAULT_FS="ext2" + SLICE_PREFIX="" elif is_freebsd; then unpack_opts="xv" pack_opts="cf" @@ -198,6 +199,7 @@ elif is_freebsd; then DEV_MPATHDIR="/dev/multipath" NEWFS_DEFAULT_FS="ufs" + SLICE_PREFIX="p" else unpack_opts="xv" pack_opts="cf" @@ -211,8 +213,9 @@ else DEV_RDSKDIR="/dev/rdsk" NEWFS_DEFAULT_FS="ufs" + SLICE_PREFIX="s" fi export unpack_opts pack_opts verbose unpack_preserve pack_preserve \ ZVOL_DEVDIR ZVOL_RDEVDIR DEV_DSKDIR DEV_RDSKDIR DEV_MPATHDIR \ ZEDLET_DIR ZED_LOG ZED_DEBUG_LOG VDEVID_CONF VDEVID_CONF_ETC \ - NEWFS_DEFAULT_FS + NEWFS_DEFAULT_FS SLICE_PREFIX |