Skip to content

Commit 885f87f

Browse files
authored
ZTS: Fix zpool_status_features_001_pos local test (#17174)
Update 'zfs-helpers.sh -i' to install the compatibility.d/ file symlinks. These are need to run the zpool_status_features_001_pos test from a local workspace (as opposed to running ZTS from a formal 'make install' or install from RPMs, which are unaffected). Signed-off-by: Tony Hutter <[email protected]> Reviewed-by: @ImAwsumm Reviewed-by: Alexander Motin <[email protected]>
1 parent fd01824 commit 885f87f

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

scripts/Makefile.am

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ export INSTALL_UDEV_RULE_DIR=$(udevruledir)
5959
export INSTALL_MOUNT_HELPER_DIR=$(mounthelperdir)
6060
export INSTALL_SYSCONF_DIR=$(sysconfdir)
6161
export INSTALL_PYTHON_DIR=$(pythonsitedir)
62+
export INSTALL_PKGDATA_DIR=$(pkgdatadir)
6263

6364
export KMOD_SPL=$(abs_top_builddir)/module/spl.ko
6465
export KMOD_ZFS=$(abs_top_builddir)/module/zfs.ko

scripts/zfs-helpers.sh

+2
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ if [ "${INSTALL}" = "yes" ]; then
163163
install "$UDEV_RULE_DIR/$rule" "$INSTALL_UDEV_RULE_DIR/$rule"
164164
done
165165
install "$ZPOOL_SCRIPT_DIR" "$INSTALL_SYSCONF_DIR/zfs/zpool.d"
166+
install "$ZPOOL_COMPAT_DIR" "$INSTALL_PKGDATA_DIR/compatibility.d"
166167
install "$CONTRIB_DIR/pyzfs/libzfs_core" "$INSTALL_PYTHON_DIR/libzfs_core"
167168
# Ideally we would install these in the configured ${libdir}, which is
168169
# by default "/usr/local/lib and unfortunately not included in the
@@ -179,6 +180,7 @@ else
179180
remove "$INSTALL_UDEV_RULE_DIR/69-vdev.rules"
180181
remove "$INSTALL_UDEV_RULE_DIR/90-zfs.rules"
181182
remove "$INSTALL_SYSCONF_DIR/zfs/zpool.d"
183+
remove "$INSTALL_PKGDATA_DIR/compatibility.d"
182184
remove "$INSTALL_PYTHON_DIR/libzfs_core"
183185
remove "/lib/libzfs_core.so"
184186
remove "/lib/libnvpair.so"

0 commit comments

Comments
 (0)