Skip to content

Commit 26439bc

Browse files
committed
Re-add sysconfig/origin-node
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.
1 parent 64882c0 commit 26439bc

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

contrib/systemd/origin-node.sysconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Placeholder
2+
# This file is populated by the installer

origin.spec

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,9 @@ done
304304

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

307+
# This is required because if we remove it then the file will be removed on upgrade
308+
install -m 0644 contrib/systemd/origin-node.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{name}-node
309+
307310
# Install man1 man pages
308311
install -d -m 0755 %{buildroot}%{_mandir}/man1
309312
install -m 0644 docs/man/man1/* %{buildroot}%{_mandir}/man1/
@@ -385,6 +388,7 @@ touch --reference=%{SOURCE0} $RPM_BUILD_ROOT/usr/sbin/%{name}-docker-excluder
385388
%files node
386389
%{_bindir}/openshift-node-config
387390
%{_sysconfdir}/systemd/system.conf.d/origin-accounting.conf
391+
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-node
388392
%defattr(-,root,root,0700)
389393
%config(noreplace) %{_sysconfdir}/origin/node
390394

0 commit comments

Comments
 (0)