diff options
| author | Martin Schwenke <martin@meltin.net> | 2016-08-03 06:51:57 +1000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2016-08-10 11:24:38 +0200 |
| commit | ae5f9b04e85af45866975f0355f1c0a43513f9e8 (patch) | |
| tree | b45f8c4a9636c2b3208473ad3d528d8b0f06e039 | |
| parent | be449dbb3f4092fd71fd61ddbdeae6971aa74c2e (diff) | |
| download | samba-ae5f9b04e85af45866975f0355f1c0a43513f9e8.tar.gz | |
ctdb-packaging: Stop RPM from renaming working config to ctdb.rpmsave
The change to ctdbd.conf and removal of /etc/sysconfig/ctdb as a
configuration file makes RPM rename the latter with a .rpmsave suffix.
This means that a working configuration is moved aside on upgrade and
manual intervention is needed.
Avoid this by convincing RPM that the existing /etc/sysconfig/ctdb is
still a configuration file.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12125
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Mon Aug 8 11:30:58 CEST 2016 on sn-devel-144
(cherry picked from commit 464b386d55b0c509b86645bdac7f6d3df489e902)
| -rw-r--r-- | ctdb/packaging/RPM/ctdb.spec.in | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in index 28af1d085aa..ea97d8e7a76 100644 --- a/ctdb/packaging/RPM/ctdb.spec.in +++ b/ctdb/packaging/RPM/ctdb.spec.in @@ -115,6 +115,15 @@ DESTDIR=$RPM_BUILD_ROOT ./buildtools/bin/waf install install -m644 config/ctdbd.conf $RPM_BUILD_ROOT%{_sysconfdir}/ctdb +# Add a pointer to modern location for configuration file. Allow with +# "noreplace" in the files section, this stops RPM moving aside a +# working configuration. +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig +cat >$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ctdb <<EOF +# CTDB configuration is now in %{_sysconfdir}/ctdb/ctdbd.conf +EOF +chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ctdb + %if %{with_systemd} mkdir -p $RPM_BUILD_ROOT%{_unitdir} install -m 755 config/ctdb.service $RPM_BUILD_ROOT%{_unitdir} @@ -151,6 +160,8 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/ctdb/gcore_trace.sh %config(noreplace) %{_sysconfdir}/ctdb/debug_locks.sh +%config(noreplace, missingok) %{_sysconfdir}/sysconfig/ctdb + %if %{with_systemd} %{_unitdir}/ctdb.service %else |