Skip to content

Commit

Permalink
etc/init.d: decide which variant to use at build time.
Browse files Browse the repository at this point in the history
Let Debian use the sysv-rc variant of the script, even when OpenRC is
installed. Unlike on Gentoo, OpenRC on Debian consumes both the
sysv-rc scripts and OpenRC ones. ZFS initscripts on Debian should be
the sysv-rc version to provide most compatibility and to integrate
with the rest of initscripts for dependency tracking.

Restrict the substitution in the Makefile to the dedicated list.

This construct is inspired by Mo Zhou's detection of the execution
shell and follows the strategy of Peter in 6ef28c5.

As of 2024, the initscripts are mostly relevant on Debian, Gentoo and
their derivatives.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Benda Xu <orv@debian.org>
Issue #8063
Issue #8204
Issue #8359
Closes #15977
  • Loading branch information
heroxbd authored Apr 8, 2024
1 parent f07389d commit 162cc80
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 13 deletions.
1 change: 1 addition & 0 deletions config/Substfiles.am
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ subst_sed_cmd = \
-e 's|@ASAN_ENABLED[@]|$(ASAN_ENABLED)|g' \
-e 's|@DEFAULT_INIT_NFS_SERVER[@]|$(DEFAULT_INIT_NFS_SERVER)|g' \
-e 's|@DEFAULT_INIT_SHELL[@]|$(DEFAULT_INIT_SHELL)|g' \
-e 's|@IS_SYSV_RC[@]|$(IS_SYSV_RC)|g' \
-e 's|@LIBFETCH_DYNAMIC[@]|$(LIBFETCH_DYNAMIC)|g' \
-e 's|@LIBFETCH_SONAME[@]|$(LIBFETCH_SONAME)|g' \
-e 's|@PYTHON[@]|$(PYTHON)|g' \
Expand Down
8 changes: 5 additions & 3 deletions config/zfs-build.m4
Original file line number Diff line number Diff line change
Expand Up @@ -578,13 +578,15 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
AC_MSG_CHECKING([default shell])
case "$VENDOR" in
gentoo) DEFAULT_INIT_SHELL="/sbin/openrc-run";;
alpine) DEFAULT_INIT_SHELL="/sbin/openrc-run";;
*) DEFAULT_INIT_SHELL="/bin/sh" ;;
gentoo|alpine) DEFAULT_INIT_SHELL=/sbin/openrc-run
IS_SYSV_RC=false ;;
*) DEFAULT_INIT_SHELL=/bin/sh
IS_SYSV_RC=true ;;
esac
AC_MSG_RESULT([$DEFAULT_INIT_SHELL])
AC_SUBST(DEFAULT_INIT_SHELL)
AC_SUBST(IS_SYSV_RC)
AC_MSG_CHECKING([default nfs server init script])
AS_IF([test "$VENDOR" = "debian"],
Expand Down
6 changes: 1 addition & 5 deletions etc/init.d/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ DESCRIPTION

They have been tested successfully on:

* Debian GNU/Linux Wheezy
* Debian GNU/Linux Jessie
* Ubuntu Trusty
* CentOS 6.0
* CentOS 6.6
* Debian GNU/Linux Bookworm
* Gentoo

SUPPORT
Expand Down
2 changes: 1 addition & 1 deletion etc/init.d/zfs-import.in
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ do_start()

# ----------------------------------------------------

if [ ! -e /sbin/openrc-run ]
if @IS_SYSV_RC@
then
case "$1" in
start)
Expand Down
2 changes: 1 addition & 1 deletion etc/init.d/zfs-load-key.in
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ do_stop()

# ----------------------------------------------------

if [ ! -e /sbin/openrc-run ]
if @IS_SYSV_RC@
then
case "$1" in
start)
Expand Down
2 changes: 1 addition & 1 deletion etc/init.d/zfs-mount.in
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ do_stop()

# ----------------------------------------------------

if [ ! -e /sbin/openrc-run ]
if @IS_SYSV_RC@
then
case "$1" in
start)
Expand Down
3 changes: 2 additions & 1 deletion etc/init.d/zfs-share.in
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ do_stop()

# ----------------------------------------------------

if [ ! -e /sbin/openrc-run ]; then
if @IS_SYSV_RC@
then
case "$1" in
start)
do_start
Expand Down
3 changes: 2 additions & 1 deletion etc/init.d/zfs-zed.in
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ do_reload()

# ----------------------------------------------------

if [ ! -e /sbin/openrc-run ]; then
if @IS_SYSV_RC@
then
case "$1" in
start)
do_start
Expand Down

0 comments on commit 162cc80

Please sign in to comment.