From 5329166169b4686720970b63ae1e7326ee4bb047 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 2 Mar 2019 19:44:59 +0100 Subject: Merging upstream version 20190301. Signed-off-by: Daniel Baumann --- bin/ceph-log | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bin/ceph-log') 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 +# Copyright (C) 2014-2019 Daniel Baumann # # 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 -- cgit v1.2.3