2019-12-30 20:08:17 +08:00
|
|
|
From f677aa5b35a1ed7c414982ad3da682d79d642c23 Mon Sep 17 00:00:00 2001
|
2019-12-30 10:22:36 +08:00
|
|
|
From: rpm-build <rpm-build>
|
2019-12-30 20:08:17 +08:00
|
|
|
Date: Mon, 30 Dec 2019 20:02:48 +0800
|
2019-12-30 10:22:36 +08:00
|
|
|
Subject: [PATCH] fix build bug with distro of openeuler
|
|
|
|
|
|
|
|
|
|
Signed-off-by: rpm-build <rpm-build>
|
|
|
|
|
---
|
|
|
|
|
configure | 19 +++++++++++++++++++
|
|
|
|
|
configure.ac | 1 +
|
|
|
|
|
service/realmd-openeuler.conf | 40 ++++++++++++++++++++++++++++++++++++++++
|
|
|
|
|
3 files changed, 60 insertions(+)
|
|
|
|
|
create mode 100644 service/realmd-openeuler.conf
|
|
|
|
|
|
|
|
|
|
diff --git a/configure b/configure
|
|
|
|
|
index 6949252..b298e88 100755
|
|
|
|
|
--- a/configure
|
|
|
|
|
+++ b/configure
|
|
|
|
|
@@ -3222,6 +3222,25 @@ if test "x$ac_cv_file__etc_SuSE_release" = xyes; then :
|
|
|
|
|
DISTRO="suse"
|
|
|
|
|
fi
|
2019-12-30 20:08:17 +08:00
|
|
|
|
2019-12-30 10:22:36 +08:00
|
|
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/openEuler-release" >&5
|
|
|
|
|
+$as_echo_n "checking for /etc/openEuler-release... " >&6; }
|
|
|
|
|
+if ${ac_cv_file__etc_openEuler_release+:} false; then :
|
|
|
|
|
+ $as_echo_n "(cached) " >&6
|
|
|
|
|
+else
|
|
|
|
|
+ test "$cross_compiling" = yes &&
|
|
|
|
|
+ as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
|
|
|
|
|
+if test -r "/etc/openEuler-release"; then
|
|
|
|
|
+ ac_cv_file__etc_openEuler_release=yes
|
|
|
|
|
+else
|
|
|
|
|
+ ac_cv_file__etc_openEuler_release=no
|
|
|
|
|
+fi
|
|
|
|
|
+fi
|
|
|
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_openEuler_release" >&5
|
|
|
|
|
+$as_echo "$ac_cv_file__etc_openEuler_release" >&6; }
|
|
|
|
|
+if test "x$ac_cv_file__etc_openEuler_release" = xyes; then :
|
|
|
|
|
+ DISTRO="openeuler"
|
|
|
|
|
+fi
|
|
|
|
|
+
|
2019-12-30 20:08:17 +08:00
|
|
|
|
|
|
|
|
# Not customized for these yet
|
|
|
|
|
|
2019-12-30 10:22:36 +08:00
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
|
|
|
index 5c0a8e7..0170662 100644
|
|
|
|
|
--- a/configure.ac
|
|
|
|
|
+++ b/configure.ac
|
|
|
|
|
@@ -37,6 +37,7 @@ if test -z $DISTRO; then
|
2019-12-30 20:08:17 +08:00
|
|
|
AC_CHECK_FILE(/etc/redhat-release, [DISTRO="redhat"])
|
|
|
|
|
AC_CHECK_FILE(/etc/debian_version, [DISTRO="debian"])
|
|
|
|
|
AC_CHECK_FILE(/etc/SuSE-release, [DISTRO="suse"])
|
2019-12-30 10:22:36 +08:00
|
|
|
+ AC_CHECK_FILE(/etc/openEuler-release, [DISTRO="openeuler"])
|
2019-12-30 20:08:17 +08:00
|
|
|
|
|
|
|
|
# Not customized for these yet
|
|
|
|
|
dnl AC_CHECK_FILE(/etc/gentoo-release, [DISTRO="gentoo"])
|
2019-12-30 10:22:36 +08:00
|
|
|
diff --git a/service/realmd-openeuler.conf b/service/realmd-openeuler.conf
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 0000000..12ca2d0
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/service/realmd-openeuler.conf
|
|
|
|
|
@@ -0,0 +1,40 @@
|
|
|
|
|
+[paths]
|
|
|
|
|
+smb.conf = /etc/samba/smb.conf
|
|
|
|
|
+
|
|
|
|
|
+[samba-packages]
|
|
|
|
|
+samba-common-tools = /usr/bin/net
|
|
|
|
|
+
|
|
|
|
|
+[winbind-packages]
|
|
|
|
|
+samba-winbind = /usr/sbin/winbindd
|
|
|
|
|
+samba-winbind-clients = /usr/bin/wbinfo
|
|
|
|
|
+oddjob = /usr/sbin/oddjobd
|
|
|
|
|
+oddjob-mkhomedir = /usr/libexec/oddjob/mkhomedir
|
|
|
|
|
+
|
|
|
|
|
+[sssd-packages]
|
|
|
|
|
+sssd = /usr/sbin/sssd
|
|
|
|
|
+oddjob = /usr/sbin/oddjobd
|
|
|
|
|
+oddjob-mkhomedir = /usr/libexec/oddjob/mkhomedir
|
|
|
|
|
+
|
|
|
|
|
+[adcli-packages]
|
|
|
|
|
+adcli = /usr/sbin/adcli
|
|
|
|
|
+
|
|
|
|
|
+[ipa-packages]
|
|
|
|
|
+freeipa-client = /usr/sbin/ipa-client-install
|
|
|
|
|
+
|
|
|
|
|
+[commands]
|
|
|
|
|
+winbind-enable-logins = /usr/bin/sh -c "/usr/bin/authselect select winbind with-mkhomedir --force && /usr/bin/systemctl enable oddjobd.service && /usr/bin/systemctl start oddjobd.service"
|
|
|
|
|
+winbind-disable-logins = /usr/bin/authselect select sssd with-mkhomedir
|
|
|
|
|
+winbind-enable-service = /usr/bin/systemctl enable winbind.service
|
|
|
|
|
+winbind-disable-service = /usr/bin/systemctl disable winbind.service
|
|
|
|
|
+winbind-restart-service = /usr/bin/systemctl restart winbind.service
|
|
|
|
|
+winbind-stop-service = /usr/bin/systemctl stop winbind.service
|
|
|
|
|
+
|
|
|
|
|
+sssd-enable-logins = /usr/bin/sh -c "/usr/bin/authselect select sssd with-mkhomedir --force && /usr/bin/systemctl enable oddjobd.service && /usr/bin/systemctl start oddjobd.service"
|
|
|
|
|
+sssd-disable-logins = /usr/bin/authselect select sssd with-mkhomedir
|
|
|
|
|
+sssd-enable-service = /usr/bin/systemctl enable sssd.service
|
|
|
|
|
+sssd-disable-service = /usr/bin/systemctl disable sssd.service
|
|
|
|
|
+sssd-restart-service = /usr/bin/systemctl restart sssd.service
|
|
|
|
|
+sssd-stop-service = /usr/bin/systemctl stop sssd.service
|
|
|
|
|
+sssd-caches-flush = /usr/sbin/sss_cache --users --groups --netgroups --services --autofs-maps
|
|
|
|
|
+
|
|
|
|
|
+name-caches-flush =
|
2019-12-30 20:08:17 +08:00
|
|
|
--
|
2019-12-30 10:22:36 +08:00
|
|
|
1.8.3.1
|
|
|
|
|
|