Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: setup: turn engine.conf to ghost ......................................................................
packaging: setup: turn engine.conf to ghost this file should not be used as drop dir resolves the rpmnew/rpmsave hell. it must remain as ghost for backward compatibility. Related-To: https://bugzilla.redhat.com/show_bug.cgi?id=1020675 Change-Id: I68ada5e69ec8fc255013b29ad47134f30bacd758 Signed-off-by: Alon Bar-Lev <alo...@redhat.com> --- M ovirt-engine.spec.in D packaging/etc/engine.conf 2 files changed, 2 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/20515/1 diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index 2c3fa52..ad0f523 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -637,6 +637,7 @@ # these files are created empty in order to mark # them as %ghost # +touch "%{buildroot}%{engine_etc}/engine.conf" touch "%{buildroot}%{engine_etc}/notifier/notifier.conf" touch "%{buildroot}%{engine_pki}/cacert.template" touch "%{buildroot}%{engine_pki}/cert.template" @@ -680,7 +681,6 @@ %files -%config(noreplace) %{engine_etc}/engine.conf %dir %attr(-, %{engine_user}, %{engine_group}) %{engine_cache} %dir %attr(-, %{engine_user}, %{engine_group}) %{engine_log} %dir %attr(-, %{engine_user}, %{engine_group}) %{engine_log}/dump @@ -695,6 +695,7 @@ %dir %{engine_etc}/engine.conf.d %dir %{engine_java} %doc LICENSE +%ghost %config(noreplace) %{engine_etc}/engine.conf %{engine_data}/branding/ovirt.brand/ %{engine_etc}/branding/00-ovirt.brand %{engine_java}/common.jar diff --git a/packaging/etc/engine.conf b/packaging/etc/engine.conf deleted file mode 100644 index c7a6922..0000000 --- a/packaging/etc/engine.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# For descriptions of the parameters and their default values look -# at the /usr/share/ovirt-engine/services/ovirt-engine/ovirt-engine.conf file. -# -# Please note that the engine installation tool engine-setup will -# append the modified parameters to the end of this file. -# -- To view, visit http://gerrit.ovirt.org/20515 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I68ada5e69ec8fc255013b29ad47134f30bacd758 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
