Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge pull request #142 from truenas/NAS-122578-zfsd-exec-perm 

NAS-122578 / None / Make zfsd executable in order to run it from the rc.d script
This commit is contained in:
Alexander Motin 2023-06-27 18:26:25 -04:00 committed by GitHub
parent 1e1523c2e5 66066524df
commit 638a717d2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etc/Makefile.am
View File

@ -22,13 +22,12 @@ SHELLCHECKSCRIPTS += $(sysconf_zfs_DATA)
$(call SHELLCHECK_OPTS,$(sysconf_zfs_DATA)): SHELLCHECK_SHELL = sh
if BUILD_FREEBSD
sysconf_zfsddir = $(sysconfdir)/rc.d
rcdir = $(sysconfdir)/rc.d
rc_SCRIPTS = %D%/rc.d/zfsd
sysconf_zfsd_DATA = %D%/rc.d/zfsd
SUBSTFILES += $(sysconf_zfsd_DATA)
SHELLCHECKSCRIPTS += $(sysconf_zfsd_DATA)
$(call SHELLCHECK_OPTS,$(sysconf_zfsd_DATA)): SHELLCHECK_SHELL = sh
SUBSTFILES += $(rc_SCRIPTS)
SHELLCHECKSCRIPTS += $(rc_SCRIPTS)
$(call SHELLCHECK_OPTS,$(rc_SCRIPTS)): SHELLCHECK_SHELL = sh
endif
if BUILD_LINUX

7
etc/rc.d/Makefile.am
View File

@ -1,7 +0,0 @@
include $(top_srcdir)/config/Substfiles.am
EXTRA_DIST += zfsd.in
init_SCRIPTS = zfsd
SUBSTFILES += $(init_SCRIPTS)