From 4d0b70068894af2d9c2c4b6fea1451a47864bfd8 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Tue, 14 Nov 2017 15:55:39 +0100 Subject: [PATCH] sysctl: relocate 90-ceph-osd.conf under etc/sysctl/ Signed-off-by: David Disseldorp --- ceph.spec.in | 2 +- debian/rules | 2 +- {src => etc/sysctl}/90-ceph-osd.conf | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename {src => etc/sysctl}/90-ceph-osd.conf (100%) diff --git a/ceph.spec.in b/ceph.spec.in index 73001d7e3d3..5056eb98bce 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -886,7 +886,7 @@ mkdir -p %{buildroot}%{_sbindir} install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING -install -m 0644 -D src/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf +install -m 0644 -D etc/sysctl/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf # firewall templates and /sbin/mount.ceph symlink %if 0%{?suse_version} diff --git a/debian/rules b/debian/rules index fec3b47c888..61dc2d3c1c1 100755 --- a/debian/rules +++ b/debian/rules @@ -44,7 +44,7 @@ override_dh_auto_install: install -D -m 644 udev/95-ceph-osd.rules $(DESTDIR)/lib/udev/rules.d/95-ceph-osd.rules install -D -m 644 udev/60-ceph-by-parttypeuuid.rules $(DESTDIR)/lib/udev/rules.d/60-ceph-by-parttypeuuid.rules install -D -m 644 src/etc-rbdmap $(DESTDIR)/etc/ceph/rbdmap - install -D -m 644 src/90-ceph-osd.conf $(DESTDIR)/etc/sysctl.d/30-ceph-osd.conf + install -D -m 644 etc/sysctl/90-ceph-osd.conf $(DESTDIR)/etc/sysctl.d/30-ceph-osd.conf # doc/changelog is a directory, which confuses dh_installchangelogs override_dh_installchangelogs: diff --git a/src/90-ceph-osd.conf b/etc/sysctl/90-ceph-osd.conf similarity index 100% rename from src/90-ceph-osd.conf rename to etc/sysctl/90-ceph-osd.conf