Skip to content

Commit 7185283

Browse files
ddisssmithfarm
authored andcommitted
sysctl: relocate 90-ceph-osd.conf under etc/sysctl/
Signed-off-by: David Disseldorp <[email protected]> (cherry picked from commit 4d0b700)
1 parent ecec659 commit 7185283

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

Diff for: ceph.spec.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ mkdir -p %{buildroot}%{_sbindir}
884884
install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph
885885
chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf
886886
install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING
887-
install -m 0644 -D src/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf
887+
install -m 0644 -D etc/sysctl/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf
888888

889889
# firewall templates and /sbin/mount.ceph symlink
890890
%if 0%{?suse_version}

Diff for: debian/rules

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ override_dh_auto_install:
5050
install -D -m 644 udev/95-ceph-osd.rules $(DESTDIR)/lib/udev/rules.d/95-ceph-osd.rules
5151
install -D -m 644 udev/60-ceph-by-parttypeuuid.rules $(DESTDIR)/lib/udev/rules.d/60-ceph-by-parttypeuuid.rules
5252
install -D -m 644 src/etc-rbdmap $(DESTDIR)/etc/ceph/rbdmap
53-
install -D -m 644 src/90-ceph-osd.conf $(DESTDIR)/etc/sysctl.d/30-ceph-osd.conf
53+
install -D -m 644 etc/sysctl/90-ceph-osd.conf $(DESTDIR)/etc/sysctl.d/30-ceph-osd.conf
5454

5555
# doc/changelog is a directory, which confuses dh_installchangelogs
5656
override_dh_installchangelogs:
File renamed without changes.

0 commit comments

Comments
 (0)