Skip to content

Commit fff4612

Browse files
xin3liangandrewc12
authored andcommitted
autoconf: add support for openEuler
Add config support for openEuler, so that it set the right sysconfig dir for openEuler. And DEFAULT_INIT_SCRIPT is no longer needed since commit "2a34db1bd Base init scripts for SYSV systems". Reviewed-by: George Melikov <[email protected]> Reviewed-by: Richard Yao <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Xinliang Liu <[email protected]> Closes openzfs#14241
1 parent ccbc5f1 commit fff4612

File tree

1 file changed

+6
-19
lines changed

1 file changed

+6
-19
lines changed

config/zfs-build.m4

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,8 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
532532
VENDOR=alpine ;
533533
elif test -f /bin/freebsd-version ; then
534534
VENDOR=freebsd ;
535+
elif test -f /etc/openEuler-release ; then
536+
VENDOR=openeuler ;
535537
else
536538
VENDOR= ;
537539
fi],
@@ -556,6 +558,7 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
556558
ubuntu) DEFAULT_PACKAGE=deb ;;
557559
debian) DEFAULT_PACKAGE=deb ;;
558560
freebsd) DEFAULT_PACKAGE=pkg ;;
561+
openeuler) DEFAULT_PACKAGE=rpm ;;
559562
*) DEFAULT_PACKAGE=rpm ;;
560563
esac
561564
AC_MSG_RESULT([$DEFAULT_PACKAGE])
@@ -569,31 +572,14 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
569572
AC_MSG_RESULT([$initdir])
570573
AC_SUBST(initdir)
571574
572-
AC_MSG_CHECKING([default init script type and shell])
573-
case "$VENDOR" in
574-
toss) DEFAULT_INIT_SCRIPT=redhat ;;
575-
redhat) DEFAULT_INIT_SCRIPT=redhat ;;
576-
fedora) DEFAULT_INIT_SCRIPT=fedora ;;
577-
gentoo) DEFAULT_INIT_SCRIPT=openrc ;;
578-
alpine) DEFAULT_INIT_SCRIPT=openrc ;;
579-
arch) DEFAULT_INIT_SCRIPT=lsb ;;
580-
sles) DEFAULT_INIT_SCRIPT=lsb ;;
581-
slackware) DEFAULT_INIT_SCRIPT=lsb ;;
582-
lunar) DEFAULT_INIT_SCRIPT=lunar ;;
583-
ubuntu) DEFAULT_INIT_SCRIPT=lsb ;;
584-
debian) DEFAULT_INIT_SCRIPT=lsb ;;
585-
freebsd) DEFAULT_INIT_SCRIPT=freebsd;;
586-
*) DEFAULT_INIT_SCRIPT=lsb ;;
587-
esac
588-
575+
AC_MSG_CHECKING([default shell])
589576
case "$VENDOR" in
590577
gentoo) DEFAULT_INIT_SHELL="/sbin/openrc-run";;
591578
alpine) DEFAULT_INIT_SHELL="/sbin/openrc-run";;
592579
*) DEFAULT_INIT_SHELL="/bin/sh" ;;
593580
esac
594581
595-
AC_MSG_RESULT([$DEFAULT_INIT_SCRIPT:$DEFAULT_INIT_SHELL])
596-
AC_SUBST(DEFAULT_INIT_SCRIPT)
582+
AC_MSG_RESULT([$DEFAULT_INIT_SHELL])
597583
AC_SUBST(DEFAULT_INIT_SHELL)
598584
599585
AC_MSG_CHECKING([default nfs server init script])
@@ -612,6 +598,7 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
612598
redhat) initconfdir=/etc/sysconfig ;;
613599
fedora) initconfdir=/etc/sysconfig ;;
614600
sles) initconfdir=/etc/sysconfig ;;
601+
openeuler) initconfdir=/etc/sysconfig ;;
615602
ubuntu) initconfdir=/etc/default ;;
616603
debian) initconfdir=/etc/default ;;
617604
freebsd) initconfdir=$sysconfdir/rc.conf.d;;

0 commit comments

Comments
 (0)