diff options
| -rw-r--r-- | ceph.spec.in | 1 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | src/logrotate.conf | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/ceph.spec.in b/ceph.spec.in index 7efb9889a74..a701abddf3c 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -24,7 +24,6 @@ Source0: http://ceph.com/download/%{name}-%{version}.tar.bz2 Requires: librbd1 = %{version}-%{release} Requires: librados2 = %{version}-%{release} Requires: libcephfs1 = %{version}-%{release} -Requires: perl Requires: python Requires(post): binutils BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian/control b/debian/control index 5f71995a932..e79cbbd2292 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Standards-Version: 3.9.3 Package: ceph Architecture: linux-any -Depends: ${shlibs:Depends}, ${misc:Depends}, sdparm | hdparm, binutils, ceph-common, uuid-runtime, python, xfsprogs, perl +Depends: ${shlibs:Depends}, ${misc:Depends}, sdparm | hdparm, binutils, ceph-common, uuid-runtime, python, xfsprogs Recommends: ceph-mds, librados2, librbd1, btrfs-tools, gdisk, parted Description: distributed storage and file system Ceph is a distributed storage system designed to provide excellent diff --git a/src/logrotate.conf b/src/logrotate.conf index 9af310413d9..0a4a5a2422a 100644 --- a/src/logrotate.conf +++ b/src/logrotate.conf @@ -15,7 +15,7 @@ # https://bugs.launchpad.net/upstart/+bug/1012938 for type in mon osd mds; do initctl list \ - | perl -ne 'print "$+{service} cluster=$+{cluster} id=$+{id}\n" if m{^(?<service>ceph-(mon|osd|mds)+)\s+\((?<cluster>[^/)]+)/(?<id>[^)]+)\) start/}' \ + | sed -n 's/^\(ceph-\(mon\|osd\|mds\)\+\)[ \t]\+(\([^ \/]\+\)\/\([^ \/]\+\))[ \t]\+start\/.*$/\1 cluster=\3 id=\4/p' \ | while read l; do initctl reload -- $l 2>/dev/null || : done |