Skip to content

Commit

Permalink
automake: don't distribute /e/d/zfs or /e/z/zfs-functions +x
Browse files Browse the repository at this point in the history
Closes openzfs#13496
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
  • Loading branch information
nabijaczleweli committed May 24, 2022
1 parent 4dc1c8a commit dc921e2
Showing 1 changed file with 13 additions and 12 deletions.
25 changes: 13 additions & 12 deletions etc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,29 @@ EXTRA_DIST += $(sudoersd_DATA)

sysconf_zfsdir = $(sysconfdir)/zfs

ETCZFSSCRIPTS = \
%D%/zfs/zfs-functions

SUBSTFILES += $(ETCZFSSCRIPTS)
SHELLCHECKSCRIPTS += $(ETCZFSSCRIPTS)
$(call SHELLCHECK_OPTS,$(ETCZFSSCRIPTS)): SHELLCHECK_SHELL = sh

dist_sysconf_zfs_DATA = \
%D%/zfs/vdev_id.conf.alias.example \
%D%/zfs/vdev_id.conf.multipath.example \
%D%/zfs/vdev_id.conf.sas_direct.example \
%D%/zfs/vdev_id.conf.sas_switch.example \
%D%/zfs/vdev_id.conf.scsi.example

sysconf_zfs_SCRIPTS = \
%D%/zfs/zfs-functions

SUBSTFILES += $(sysconf_zfs_SCRIPTS)
SHELLCHECKSCRIPTS += $(sysconf_zfs_SCRIPTS)
$(call SHELLCHECK_OPTS,$(sysconf_zfs_SCRIPTS)): SHELLCHECK_SHELL = sh
%D%/zfs/vdev_id.conf.scsi.example \
$(ETCZFSSCRIPTS)


if BUILD_LINUX
initconf_SCRIPTS = \
dist_initconf_DATA = \
%D%/default/zfs

SUBSTFILES += $(initconf_SCRIPTS)
SHELLCHECKSCRIPTS += $(initconf_SCRIPTS)
$(call SHELLCHECK_OPTS,$(initconf_SCRIPTS)): SHELLCHECK_SHELL = sh
SUBSTFILES += $(dist_initconf_DATA)
SHELLCHECKSCRIPTS += $(dist_initconf_DATA)
$(call SHELLCHECK_OPTS,$(dist_initconf_DATA)): SHELLCHECK_SHELL = sh


if INIT_SYSV
Expand Down

0 comments on commit dc921e2

Please sign in to comment.