diff options
| author | наб <[email protected]> | 2022-04-10 22:47:56 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2022-05-10 10:20:34 -0700 |
| commit | 0a9aaa7f0cc16f1771f492cce665bc5c5eb8e735 (patch) | |
| tree | 685a29bda113f8264935eb2d1e2238ef2de31765 /scripts | |
| parent | eaf94bda6cc31eb11822be5c782b8b43279212ee (diff) | |
cmd: move single-file binaries up, extract udev programs to udev/
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #13316
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 2 | ||||
| -rwxr-xr-x | scripts/zfs-helpers.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 586ead05b..5a409484f 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -35,6 +35,8 @@ export GDB="libtool --mode=execute gdb" export LDMOD=/sbin/insmod export CMD_DIR=$(abs_top_builddir) +export UDEV_SCRIPT_DIR=$(abs_top_srcdir)/udev +export UDEV_CMD_DIR=$(abs_top_builddir)/udev export UDEV_RULE_DIR=$(abs_top_builddir)/udev/rules.d export ZEDLET_ETC_DIR=$$CMD_DIR/cmd/zed/zed.d export ZEDLET_LIBEXEC_DIR=$$CMD_DIR/cmd/zed/zed.d diff --git a/scripts/zfs-helpers.sh b/scripts/zfs-helpers.sh index 5fa932dcc..8dcb06301 100755 --- a/scripts/zfs-helpers.sh +++ b/scripts/zfs-helpers.sh @@ -156,7 +156,7 @@ if [ "${INSTALL}" = "yes" ]; then for cmd in "mount.zfs" "fsck.zfs"; do install "$CMD_DIR/$cmd" "$INSTALL_MOUNT_HELPER_DIR/$cmd" done - for udev in "$CMD_DIR/zvol_id" "$UDEV_SCRIPT_DIR/vdev_id"; do + for udev in "$UDEV_CMD_DIR/zvol_id" "$UDEV_SCRIPT_DIR/vdev_id"; do install "$udev" "$INSTALL_UDEV_DIR/${udev##*/}" done for rule in "60-zvol.rules" "69-vdev.rules" "90-zfs.rules"; do |