summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac1
-rw-r--r--contrib/initramfs/Makefile.am11
-rw-r--r--etc/Makefile.am4
-rw-r--r--etc/default/.gitignore1
-rw-r--r--etc/default/Makefile.am12
-rw-r--r--etc/default/zfs.in (renamed from etc/init.d/zfs.in)0
-rw-r--r--etc/init.d/.gitignore1
-rw-r--r--etc/init.d/Makefile.am16
-rw-r--r--etc/init.d/README.md2
-rw-r--r--etc/zfs/.gitignore1
-rw-r--r--etc/zfs/Makefile.am26
-rw-r--r--etc/zfs/zfs-functions.in (renamed from etc/init.d/zfs-functions.in)0
12 files changed, 48 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac
index 1160897f3..eeb0a3843 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,6 +98,7 @@ AC_CONFIG_FILES([
contrib/pyzfs/setup.py
contrib/zcp/Makefile
etc/Makefile
+ etc/default/Makefile
etc/init.d/Makefile
etc/modules-load.d/Makefile
etc/sudoers.d/Makefile
diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am
index 52bdeb2af..849b1d83c 100644
--- a/contrib/initramfs/Makefile.am
+++ b/contrib/initramfs/Makefile.am
@@ -6,15 +6,10 @@ initrd_SCRIPTS = \
SUBDIRS = hooks scripts
EXTRA_DIST = \
- $(top_srcdir)/etc/init.d/zfs \
- $(top_srcdir)/etc/init.d/zfs-functions \
$(top_srcdir)/contrib/initramfs/conf.d/zfs \
$(top_srcdir)/contrib/initramfs/conf-hooks.d/zfs \
$(top_srcdir)/contrib/initramfs/README.initramfs.markdown
-$(top_srcdir)/etc/init.d/zfs $(top_srcdir)/etc/init.d/zfs-functions:
- $(MAKE) -C $(top_srcdir)/etc/init.d zfs zfs-functions
-
install-initrdSCRIPTS: $(EXTRA_DIST)
for d in conf.d conf-hooks.d scripts/local-top; do \
$(MKDIR_P) $(DESTDIR)$(initrddir)/$$d; \
@@ -26,9 +21,3 @@ install-initrdSCRIPTS: $(EXTRA_DIST)
cp $(top_builddir)/contrib/initramfs/$$d/zfs \
$(DESTDIR)$(initrddir)/$$d/; \
done
- $(MKDIR_P) $(DESTDIR)$(DEFAULT_INITCONF_DIR); \
- cp $(top_builddir)/etc/init.d/zfs \
- $(DESTDIR)$(DEFAULT_INITCONF_DIR)/; \
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/zfs; \
- cp $(top_builddir)/etc/init.d/zfs-functions \
- $(DESTDIR)$(sysconfdir)/zfs/
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 28b955106..67ef94a20 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = zfs sudoers.d $(ZFS_INIT_SYSTEMD) $(ZFS_INIT_SYSV) $(ZFS_MODULE_LOAD)
-DIST_SUBDIRS = init.d zfs systemd modules-load.d sudoers.d
+SUBDIRS = default zfs sudoers.d $(ZFS_INIT_SYSTEMD) $(ZFS_INIT_SYSV) $(ZFS_MODULE_LOAD)
+DIST_SUBDIRS = default init.d zfs systemd modules-load.d sudoers.d
diff --git a/etc/default/.gitignore b/etc/default/.gitignore
new file mode 100644
index 000000000..73304bc2c
--- /dev/null
+++ b/etc/default/.gitignore
@@ -0,0 +1 @@
+zfs
diff --git a/etc/default/Makefile.am b/etc/default/Makefile.am
new file mode 100644
index 000000000..f35abd8e5
--- /dev/null
+++ b/etc/default/Makefile.am
@@ -0,0 +1,12 @@
+initconfdir = $(DEFAULT_INITCONF_DIR)
+initconf_SCRIPTS = zfs
+
+EXTRA_DIST = \
+ $(top_srcdir)/etc/default/zfs.in
+
+$(initconf_SCRIPTS):%:%.in Makefile
+ $(SED) \
+ -e 's,@sysconfdir\@,$(sysconfdir),g' \
+ $< >'$@'
+
+CLEANFILES = $(initconf_SCRIPTS)
diff --git a/etc/init.d/zfs.in b/etc/default/zfs.in
index 42fc1161c..42fc1161c 100644
--- a/etc/init.d/zfs.in
+++ b/etc/default/zfs.in
diff --git a/etc/init.d/.gitignore b/etc/init.d/.gitignore
index 3f16b08ec..43a673d55 100644
--- a/etc/init.d/.gitignore
+++ b/etc/init.d/.gitignore
@@ -1,4 +1,3 @@
-zfs-functions
zfs-import
zfs-mount
zfs-share
diff --git a/etc/init.d/Makefile.am b/etc/init.d/Makefile.am
index 953c31fd5..19fa76a2b 100644
--- a/etc/init.d/Makefile.am
+++ b/etc/init.d/Makefile.am
@@ -1,21 +1,15 @@
initdir = $(DEFAULT_INIT_DIR)
init_SCRIPTS = zfs-import zfs-mount zfs-share zfs-zed
-initcommondir = $(sysconfdir)/zfs
-initcommon_SCRIPTS = zfs-functions
-
initconfdir = $(DEFAULT_INITCONF_DIR)
-initconf_SCRIPTS = zfs
EXTRA_DIST = \
- $(top_srcdir)/etc/init.d/zfs-functions.in \
$(top_srcdir)/etc/init.d/zfs-share.in \
$(top_srcdir)/etc/init.d/zfs-import.in \
$(top_srcdir)/etc/init.d/zfs-mount.in \
- $(top_srcdir)/etc/init.d/zfs-zed.in \
- $(top_srcdir)/etc/init.d/zfs.in
+ $(top_srcdir)/etc/init.d/zfs-zed.in
-$(init_SCRIPTS) $(initconf_SCRIPTS) $(initcommon_SCRIPTS):%:%.in Makefile
+$(init_SCRIPTS):%:%.in Makefile
-(if [ -e /etc/debian_version ]; then \
NFS_SRV=nfs-kernel-server; \
else \
@@ -26,7 +20,8 @@ $(init_SCRIPTS) $(initconf_SCRIPTS) $(initcommon_SCRIPTS):%:%.in Makefile
else \
SHELL=/bin/sh; \
fi; \
- $(SED) -e 's,@bindir\@,$(bindir),g' \
+ $(SED) \
+ -e 's,@bindir\@,$(bindir),g' \
-e 's,@sbindir\@,$(sbindir),g' \
-e 's,@udevdir\@,$(udevdir),g' \
-e 's,@udevruledir\@,$(udevruledir),g' \
@@ -37,7 +32,6 @@ $(init_SCRIPTS) $(initconf_SCRIPTS) $(initcommon_SCRIPTS):%:%.in Makefile
-e "s,@SHELL\@,$$SHELL,g" \
-e "s,@NFS_SRV\@,$$NFS_SRV,g" \
$< >'$@'; \
- [ '$@' = 'zfs-functions' -o '$@' = 'zfs' ] || \
chmod +x '$@')
-CLEANFILES = $(init_SCRIPTS) $(initcommon_SCRIPTS) $(initconf_SCRIPTS)
+CLEANFILES = $(init_SCRIPTS)
diff --git a/etc/init.d/README.md b/etc/init.d/README.md
index 89edb1da3..ad7c053aa 100644
--- a/etc/init.d/README.md
+++ b/etc/init.d/README.md
@@ -35,7 +35,7 @@ SUPPORT
If you're making your own distribution and you want the scripts to
work on that, the biggest problem you'll (probably) have is the part
- at the beginning of the "zfs-functions.in" file which sets up the
+ at the beginning of the "zfs-functions" file which sets up the
logging output.
INSTALLING INIT SCRIPT LINKS
diff --git a/etc/zfs/.gitignore b/etc/zfs/.gitignore
new file mode 100644
index 000000000..1b2d752de
--- /dev/null
+++ b/etc/zfs/.gitignore
@@ -0,0 +1 @@
+zfs-functions
diff --git a/etc/zfs/Makefile.am b/etc/zfs/Makefile.am
index 52f6634df..81567a4fa 100644
--- a/etc/zfs/Makefile.am
+++ b/etc/zfs/Makefile.am
@@ -6,5 +6,29 @@ pkgsysconf_DATA = \
vdev_id.conf.sas_switch.example \
vdev_id.conf.multipath.example \
vdev_id.conf.scsi.example
+pkgsysconf_SCRIPTS = \
+ zfs-functions
-EXTRA_DIST = $(pkgsysconf_DATA)
+EXTRA_DIST = $(pkgsysconf_DATA) \
+ zfs-functions.in
+
+$(pkgsysconf_SCRIPTS):%:%.in Makefile
+ -(if [ -e /etc/debian_version ]; then \
+ NFS_SRV=nfs-kernel-server; \
+ else \
+ NFS_SRV=nfs; \
+ fi; \
+ if [ -e /sbin/openrc-run ]; then \
+ SHELL=/sbin/openrc-run; \
+ else \
+ SHELL=/bin/sh; \
+ fi; \
+ $(SED) \
+ -e 's,@sbindir\@,$(sbindir),g' \
+ -e 's,@sysconfdir\@,$(sysconfdir),g' \
+ -e 's,@initconfdir\@,$(initconfdir),g' \
+ $< >'$@'; \
+ [ '$@' = 'zfs-functions' ] || \
+ chmod +x '$@')
+
+CLEANFILES = $(pkgsysconf_SCRIPTS)
diff --git a/etc/init.d/zfs-functions.in b/etc/zfs/zfs-functions.in
index 043f1b073..043f1b073 100644
--- a/etc/init.d/zfs-functions.in
+++ b/etc/zfs/zfs-functions.in