]> git.proxmox.com Git - mirror_zfs.git/commitdiff
Add support for alpine linux
authorCarlo Landmeter <clandmeter@gmail.com>
Tue, 1 Mar 2016 15:36:28 +0000 (16:36 +0100)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 8 Mar 2016 21:19:53 +0000 (13:19 -0800)
Both Alpine Linux and Gentoo use OpenRC so we share its logic

Signed-off-by: Carlo Landmeter <clandmeter@gmail.com>
Signed-off-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4386

config/zfs-build.m4
etc/init.d/Makefile.am
etc/init.d/zfs-import.in
etc/init.d/zfs-mount.in
etc/init.d/zfs-share.in
etc/init.d/zfs-zed.in

index f93c5b5d4ccad503c1dadd1b11e83e6106aec633..9d3f0a6f5bbc16f84bf951382506ddc72ec4d740 100644 (file)
@@ -266,6 +266,8 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
                VENDOR=ubuntu ;
        elif test -f /etc/debian_version ; then
                VENDOR=debian ;
+       elif test -f /etc/alpine-release ; then
+               VENDOR=alpine ;
        else
                VENDOR= ;
        fi
@@ -278,6 +280,7 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
                redhat)     DEFAULT_PACKAGE=rpm  ;;
                fedora)     DEFAULT_PACKAGE=rpm  ;;
                gentoo)     DEFAULT_PACKAGE=tgz  ;;
+               alpine)     DEFAULT_PACKAGE=tgz  ;;
                arch)       DEFAULT_PACKAGE=tgz  ;;
                sles)       DEFAULT_PACKAGE=rpm  ;;
                slackware)  DEFAULT_PACKAGE=tgz  ;;
@@ -299,7 +302,8 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
                toss)       DEFAULT_INIT_SCRIPT=redhat ;;
                redhat)     DEFAULT_INIT_SCRIPT=redhat ;;
                fedora)     DEFAULT_INIT_SCRIPT=fedora ;;
-               gentoo)     DEFAULT_INIT_SCRIPT=gentoo ;;
+               gentoo)     DEFAULT_INIT_SCRIPT=openrc ;;
+               alpine)     DEFAULT_INIT_SCRIPT=openrc ;;
                arch)       DEFAULT_INIT_SCRIPT=lsb    ;;
                sles)       DEFAULT_INIT_SCRIPT=lsb    ;;
                slackware)  DEFAULT_INIT_SCRIPT=lsb    ;;
@@ -313,6 +317,7 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
 
        AC_MSG_CHECKING([default init config direectory])
        case "$VENDOR" in
+               alpine)     DEFAULT_INITCONF_DIR=/etc/conf.d    ;;
                gentoo)     DEFAULT_INITCONF_DIR=/etc/conf.d    ;;
                toss)       DEFAULT_INITCONF_DIR=/etc/sysconfig ;;
                redhat)     DEFAULT_INITCONF_DIR=/etc/sysconfig ;;
index 5f70fc658dfdfb98c63138076191ffbbe31d3f09..c6e29d1a5d2dc485575918e0d37a4064d68e1bb9 100644 (file)
@@ -21,7 +21,7 @@ $(init_SCRIPTS) $(initconf_SCRIPTS) $(initcommon_SCRIPTS): $(EXTRA_DIST)
          else \
                NFS_SRV=nfs; \
          fi; \
-         if [ -e /etc/gentoo-release ]; then \
+         if [ -e /sbin/openrc-run ]; then \
                SHELL=/sbin/runscript; \
          else \
                SHELL=/bin/sh; \
index 22586389a8358604e444e0112aa02ff1138cb8bf..354bbc6fdb7f62a2eeacc3f10d66cd0a46a647d2 100755 (executable)
@@ -308,7 +308,7 @@ do_start()
 
 # ----------------------------------------------------
 
-if [ ! -e /etc/gentoo-release ]
+if [ ! -e /sbin/openrc-run ]
 then
        case "$1" in
                start)
index 05cea9b88892ffc399b083aa078432149df7736f..34db057c813ec6e09ca837ced091e8ef55b1d9e2 100755 (executable)
@@ -199,7 +199,7 @@ do_stop()
 
 # ----------------------------------------------------
 
-if [ ! -e /etc/gentoo-release ]
+if [ ! -e /sbin/openrc-run ]
 then
        case "$1" in
                start)
index 1b70da4d50c720535f96aa800abb2a3ea186e3fd..ce3cc1cc29c032e0281b3dc1aba08e47aa9aa742 100755 (executable)
@@ -58,7 +58,7 @@ do_stop()
 
 # ----------------------------------------------------
 
-if [ ! -e /etc/gentoo-release ]; then
+if [ ! -e /sbin/openrc-run ]; then
        case "$1" in
                start)
                        do_start
index 86e31855ed8a656d82a13514293307fc0a4990c6..d0086eefddb951e95f28890f00726561799b0c90 100755 (executable)
@@ -98,7 +98,7 @@ do_reload()
 
 # ----------------------------------------------------
 
-if [ ! -e /etc/gentoo-release ]; then
+if [ ! -e /sbin/openrc-run ]; then
        case "$1" in
                start)
                        do_start