Skip to content

Commit

Permalink
Re-add systeconfig file
Browse files Browse the repository at this point in the history
This file is wholely managed by openshift-ansible. However if we remove
the file from the RPM entirely then that will delete the file during
upgrades to the newer version. So leave the file in the package with
empty contents. The %config(noreplace) directive will ensure that RPM
doesn't replace local modifications when upgrading.
  • Loading branch information
sdodson committed Aug 21, 2018
1 parent 64882c0 commit b7b2d38
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions contrib/systemd/origin-node.sysconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Placeholder
# This file is populated by the installer
4 changes: 4 additions & 0 deletions origin.spec
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,9 @@ done

install -d -m 0755 %{buildroot}%{_sysconfdir}/origin/{master,node}

# This is required because if we remove it then the file will be removed on upgrade
install -m 0644 contrib/systemd/origin-node.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{name}-node

# Install man1 man pages
install -d -m 0755 %{buildroot}%{_mandir}/man1
install -m 0644 docs/man/man1/* %{buildroot}%{_mandir}/man1/
Expand Down Expand Up @@ -385,6 +388,7 @@ touch --reference=%{SOURCE0} $RPM_BUILD_ROOT/usr/sbin/%{name}-docker-excluder
%files node
%{_bindir}/openshift-node-config
%{_sysconfdir}/systemd/system.conf.d/origin-accounting.conf
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-node
%defattr(-,root,root,0700)
%config(noreplace) %{_sysconfdir}/origin/node

Expand Down

0 comments on commit b7b2d38

Please sign in to comment.