Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
5e0a64b771 | ||
|
4d7020b5c4 | ||
|
a3ac135dd3 | ||
|
ed7921f005 | ||
|
ac289ea526 | ||
|
d53058c34f | ||
|
06e4e9a835 |
@ -1,108 +0,0 @@
|
|||||||
From bf842d0cf9ae13408e20963c977d3c85642a69b3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
|
|
||||||
Date: Thu, 18 Jun 2020 09:38:13 -0400
|
|
||||||
Subject: [PATCH] systemd: revised drop-in conf file handling
|
|
||||||
|
|
||||||
see https://bugzilla.redhat.com/show_bug.cgi?id=1848208
|
|
||||||
|
|
||||||
systemd service file documentation still sucks rocks
|
|
||||||
|
|
||||||
This is my current best guess, and at least it doesn't log errors
|
|
||||||
|
|
||||||
Change-Id: Iec9847356090e561bfcd5f41a64b35c2e686a3d6
|
|
||||||
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
|
|
||||||
---
|
|
||||||
src/nfs-ganesha.spec-in.cmake | 6 +++---
|
|
||||||
src/scripts/systemd/nfs-ganesha-lock.service.debian10 | 2 +-
|
|
||||||
src/scripts/systemd/nfs-ganesha-lock.service.el8 | 2 +-
|
|
||||||
src/scripts/systemd/rpc-statd.conf.debian10 | 2 +-
|
|
||||||
src/scripts/systemd/rpc-statd.conf.el8 | 2 +-
|
|
||||||
5 files changed, 7 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/nfs-ganesha.spec-in.cmake b/src/nfs-ganesha.spec-in.cmake
|
|
||||||
index 9cfda6c0e..d66106d6f 100644
|
|
||||||
--- a/src/nfs-ganesha.spec-in.cmake
|
|
||||||
+++ b/src/nfs-ganesha.spec-in.cmake
|
|
||||||
@@ -557,13 +557,13 @@ install -m 644 config_samples/vfs.conf %{buildroot}%{_sysconfdir}/ganesha
|
|
||||||
|
|
||||||
mkdir -p %{buildroot}%{_unitdir}
|
|
||||||
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 8 )
|
|
||||||
-mkdir -p %{buildroot}%{_sysconfdir}/systemd/system/nfs-ganesha.d
|
|
||||||
+mkdir -p %{buildroot}%{_sysconfdir}/systemd/system/nfs-ganesha-lock.service.d
|
|
||||||
%endif
|
|
||||||
|
|
||||||
install -m 644 scripts/systemd/nfs-ganesha.service.el7 %{buildroot}%{_unitdir}/nfs-ganesha.service
|
|
||||||
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 8 )
|
|
||||||
install -m 644 scripts/systemd/nfs-ganesha-lock.service.el8 %{buildroot}%{_unitdir}/nfs-ganesha-lock.service
|
|
||||||
-install -m 644 scripts/systemd/rpc-statd.conf.el8 %{buildroot}%{_sysconfdir}/systemd/system/nfs-ganesha.d/rpc-statd.conf
|
|
||||||
+install -m 644 scripts/systemd/rpc-statd.conf.el8 %{buildroot}%{_sysconfdir}/systemd/system/nfs-ganesha-lock.service.d/rpc-statd.conf
|
|
||||||
%else
|
|
||||||
install -m 644 scripts/systemd/nfs-ganesha-lock.service.el7 %{buildroot}%{_unitdir}/nfs-ganesha-lock.service
|
|
||||||
%endif
|
|
||||||
@@ -677,7 +677,7 @@ exit 0
|
|
||||||
%{_unitdir}/nfs-ganesha-lock.service
|
|
||||||
%{_unitdir}/nfs-ganesha-config.service
|
|
||||||
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 8 )
|
|
||||||
-%{_sysconfdir}/systemd/system/nfs-ganesha.d/rpc-statd.conf
|
|
||||||
+%{_sysconfdir}/systemd/system/nfs-ganesha-lock.service.d/rpc-statd.conf
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{with man_page}
|
|
||||||
diff --git a/src/scripts/systemd/nfs-ganesha-lock.service.debian10 b/src/scripts/systemd/nfs-ganesha-lock.service.debian10
|
|
||||||
index 67af058fe..da06ef4fe 100644
|
|
||||||
--- a/src/scripts/systemd/nfs-ganesha-lock.service.debian10
|
|
||||||
+++ b/src/scripts/systemd/nfs-ganesha-lock.service.debian10
|
|
||||||
@@ -17,7 +17,7 @@
|
|
||||||
|
|
||||||
[Unit]
|
|
||||||
Before=nfs-ganesha.service
|
|
||||||
-Conflicts=nfs-lock.service rpc-statd.service
|
|
||||||
+Conflicts=nfs-lock.service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
ExecStartPre=
|
|
||||||
diff --git a/src/scripts/systemd/nfs-ganesha-lock.service.el8 b/src/scripts/systemd/nfs-ganesha-lock.service.el8
|
|
||||||
index 67af058fe..da06ef4fe 100644
|
|
||||||
--- a/src/scripts/systemd/nfs-ganesha-lock.service.el8
|
|
||||||
+++ b/src/scripts/systemd/nfs-ganesha-lock.service.el8
|
|
||||||
@@ -17,7 +17,7 @@
|
|
||||||
|
|
||||||
[Unit]
|
|
||||||
Before=nfs-ganesha.service
|
|
||||||
-Conflicts=nfs-lock.service rpc-statd.service
|
|
||||||
+Conflicts=nfs-lock.service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
ExecStartPre=
|
|
||||||
diff --git a/src/scripts/systemd/rpc-statd.conf.debian10 b/src/scripts/systemd/rpc-statd.conf.debian10
|
|
||||||
index 2138f7467..d06fffd4c 100644
|
|
||||||
--- a/src/scripts/systemd/rpc-statd.conf.debian10
|
|
||||||
+++ b/src/scripts/systemd/rpc-statd.conf.debian10
|
|
||||||
@@ -13,7 +13,7 @@ After=nfs-config.service
|
|
||||||
[Service]
|
|
||||||
EnvironmentFile=-/run/sysconfig/nfs-utils
|
|
||||||
Type=forking
|
|
||||||
-PIDFile=/var/run/rpc.statd.pid
|
|
||||||
+PIDFile=/run/rpc.statd.pid
|
|
||||||
ExecStart=/sbin/rpc.statd --no-notify $STATDARGS
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
diff --git a/src/scripts/systemd/rpc-statd.conf.el8 b/src/scripts/systemd/rpc-statd.conf.el8
|
|
||||||
index 6fec09af1..b67cfdf24 100644
|
|
||||||
--- a/src/scripts/systemd/rpc-statd.conf.el8
|
|
||||||
+++ b/src/scripts/systemd/rpc-statd.conf.el8
|
|
||||||
@@ -1,3 +1,4 @@
|
|
||||||
+[Unit]
|
|
||||||
Description=NFS status monitor for NFSv2/3 locking.
|
|
||||||
DefaultDependencies=no
|
|
||||||
Conflicts=umount.target
|
|
||||||
@@ -10,5 +11,5 @@
|
|
||||||
[Service]
|
|
||||||
Environment=RPC_STATD_NO_NOTIFY=1
|
|
||||||
Type=forking
|
|
||||||
-PIDFile=/var/run/rpc.statd.pid
|
|
||||||
+PIDFile=/run/rpc.statd.pid
|
|
||||||
ExecStart=/usr/sbin/rpc.statd
|
|
||||||
--
|
|
||||||
2.26.2
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
|||||||
diff --git a/src/selinux/ganesha.te b/src/selinux/ganesha.te
|
|
||||||
index 246f9cc8c..6692eedf2 100644
|
|
||||||
--- a/src/selinux/ganesha.te
|
|
||||||
+++ b/src/selinux/ganesha.te
|
|
||||||
@@ -307,3 +307,12 @@ allow ganesha_t self:capability { fowner setgid setuid };
|
|
||||||
# allow ganesha_t glusterd_brick_t:dir { add_name getattr open read write remove_name search };
|
|
||||||
# allow ganesha_t glusterd_brick_t:file { create getattr open read write unlink };
|
|
||||||
|
|
||||||
+########################################
|
|
||||||
+#
|
|
||||||
+# ganesha local policy rhbz#1855350
|
|
||||||
+
|
|
||||||
+ifdef(`ceph_read_lib_files',`
|
|
||||||
+ optional_policy(`
|
|
||||||
+ ceph_read_lib_files(ganesha_t)
|
|
||||||
+ ')
|
|
||||||
+')
|
|
@ -114,7 +114,7 @@ Requires: openSUSE-release
|
|||||||
# %%global dev rc5
|
# %%global dev rc5
|
||||||
|
|
||||||
Name: nfs-ganesha
|
Name: nfs-ganesha
|
||||||
Version: 3.4
|
Version: 3.5
|
||||||
Release: 1%{?dev:%{dev}}%{?dist}
|
Release: 1%{?dev:%{dev}}%{?dist}
|
||||||
Summary: NFS-Ganesha is a NFS Server running in user space
|
Summary: NFS-Ganesha is a NFS Server running in user space
|
||||||
License: LGPLv3+
|
License: LGPLv3+
|
||||||
@ -530,7 +530,8 @@ cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
export VERBOSE=1
|
export VERBOSE=1
|
||||||
%cmake_build
|
make %{?_smp_mflags} || make %{?_smp_mflags} || make
|
||||||
|
|
||||||
|
|
||||||
%if ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
|
%if ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
|
||||||
make -C selinux -f /usr/share/selinux/devel/Makefile ganesha.pp
|
make -C selinux -f /usr/share/selinux/devel/Makefile ganesha.pp
|
||||||
@ -604,7 +605,7 @@ install -m 644 config_samples/gpfs.ganesha.log.conf %{buildroot}%{_sysconfdir}/g
|
|||||||
install -m 644 config_samples/gpfs.ganesha.exports.conf %{buildroot}%{_sysconfdir}/ganesha
|
install -m 644 config_samples/gpfs.ganesha.exports.conf %{buildroot}%{_sysconfdir}/ganesha
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%cmake_install
|
make DESTDIR=%{buildroot} install
|
||||||
|
|
||||||
%if ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
|
%if ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
|
||||||
install -d %{buildroot}%{_selinux_store_path}/packages
|
install -d %{buildroot}%{_selinux_store_path}/packages
|
||||||
@ -860,31 +861,16 @@ exit 0
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 28 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.5-1
|
||||||
|
- NFS-Ganesha 3.5 GA
|
||||||
|
|
||||||
* Wed Dec 23 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.4-1
|
* Wed Dec 23 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.4-1
|
||||||
- NFS-Ganesha 3.4 GA
|
- NFS-Ganesha 3.4 GA
|
||||||
|
|
||||||
* Thu Nov 5 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.3-8
|
* Mon Jul 13 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.3-3
|
||||||
- BuildRequires: make
|
|
||||||
|
|
||||||
* Tue Sep 8 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.3-7
|
|
||||||
- selinux
|
|
||||||
|
|
||||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org>
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jul 20 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.3-6
|
|
||||||
- use cmake_build and %cmake_install
|
|
||||||
|
|
||||||
* Mon Jul 20 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.3-5
|
|
||||||
- use %make_install
|
|
||||||
|
|
||||||
* Mon Jul 13 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.3-4
|
|
||||||
- rpc-statd.conf.el8
|
- rpc-statd.conf.el8
|
||||||
|
|
||||||
* Tue Jun 23 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com>
|
* Thu Jun 18 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.3-2
|
||||||
- explicit BuildRequires: python3-setuptools
|
|
||||||
|
|
||||||
* Thu Jun 18 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.3-3
|
|
||||||
- rhbz#1848208
|
- rhbz#1848208
|
||||||
|
|
||||||
* Mon Jun 8 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.3-1
|
* Mon Jun 8 2020 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.3-1
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (nfs-ganesha-3.4.tar.gz) = fe72d41cf9983824c78a622752e1ae608e14737868b9ab3528ffc019ff990c0336e226fe2a43de1757a694a470ddd47b4dc5580591c47d480f8472c72ee76058
|
SHA512 (nfs-ganesha-3.5.tar.gz) = c2a2a6d9993a7c96771d74f61465bc56a9b6ef45be10abaa351ace8f3fcb045a4f799d92292f8228bae0ac52961c0081f4fc5d852f795c7617f235ddf57bc22c
|
||||||
|
Loading…
Reference in New Issue
Block a user