diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-03-02 18:44:59 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-03-02 18:45:06 +0000 |
| commit | 5329166169b4686720970b63ae1e7326ee4bb047 (patch) | |
| tree | e041fabbef0975b6861f848391bdc8323318bbde /bin/ceph-log | |
| parent | Releasing debian version 20180915-3. (diff) | |
| download | open-infrastructure-storage-tools-5329166169b4686720970b63ae1e7326ee4bb047.tar.xz open-infrastructure-storage-tools-5329166169b4686720970b63ae1e7326ee4bb047.zip | |
Merging upstream version 20190301.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'bin/ceph-log')
| -rwxr-xr-x | bin/ceph-log | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/ceph-log b/bin/ceph-log index 1470101..68cfc16 100755 --- a/bin/ceph-log +++ b/bin/ceph-log @@ -1,7 +1,6 @@ #!/bin/sh -# storage-tools - Additional utilities to manage storage related tasks -# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # SPDX-License-Identifier: GPL-3.0+ # @@ -20,12 +19,13 @@ set -e +PROJECT="open-infrastructure" SOFTWARE="storage-tools" PROGRAM="ceph-log" -if [ -e "/etc/default/${SOFTWARE}" ] +if [ -e "/etc/${PROJECT}/ceph-tools.conf" ] then - . "/etc/default/${SOFTWARE}" + . "/etc/${PROJECT}/ceph-tools.conf" fi case "${CEPH_LOG}" in |