From 66066524dfbe03f5e96b68b197bfd7b61f1afdeb Mon Sep 17 00:00:00 2001 From: Ameer Hamza Date: Tue, 27 Jun 2023 01:48:11 +0500 Subject: [PATCH] Make zfsd executable in order to run it from the rc.d script Signed-off-by: Ameer Hamza --- etc/Makefile.am | 11 +++++------ etc/rc.d/Makefile.am | 7 ------- 2 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 etc/rc.d/Makefile.am diff --git a/etc/Makefile.am b/etc/Makefile.am index 30ee1df4d3..df7795097d 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -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 diff --git a/etc/rc.d/Makefile.am b/etc/rc.d/Makefile.am deleted file mode 100644 index cf6c7aeec4..0000000000 --- a/etc/rc.d/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -include $(top_srcdir)/config/Substfiles.am - -EXTRA_DIST += zfsd.in - -init_SCRIPTS = zfsd - -SUBSTFILES += $(init_SCRIPTS)