sysctl: relocate 90-ceph-osd.conf under etc/sysctl/

Signed-off-by: David Disseldorp <ddiss@suse.de>

diff --git a/ceph.spec.in b/ceph.spec.in
index 73001d7e3d3cb1066d8ff7a507ef4fb897300a62..5056eb98bce87884de6db1596886822fa4f62899 100644 (file)
--- 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 fec3b47c888a1e13ab207d16488d9a25793e3d36..61dc2d3c1c1c46cbf56103efb8eeef1feb111681 100755 (executable)
--- 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/etc/sysctl/90-ceph-osd.conf b/etc/sysctl/90-ceph-osd.conf
new file mode 100644 (file)
index 0000000..c5c64bb
--- /dev/null
+++ b/etc/sysctl/90-ceph-osd.conf
@@ -0,0 +1 @@
+fs.aio-max-nr = 1048576

diff --git a/src/90-ceph-osd.conf b/src/90-ceph-osd.conf
deleted file mode 100644 (file)
index c5c64bb..0000000
--- a/src/90-ceph-osd.conf
+++ /dev/null
@@ -1 +0,0 @@
-fs.aio-max-nr = 1048576