From 3817c6e258f2368bdf31d4ce9eab86c682c11d6d Mon Sep 17 00:00:00 2001
From: Michael Fritch <mfritch@suse.com>
Date: Mon, 9 Nov 2020 18:07:15 -0700
Subject: [PATCH] cephadm: verify root privileges before log dir create
root privileges need to be verified before creating the log dir
introduced by 81a7df0
Fixes: https://tracker.ceph.com/issues/48166
Signed-off-by: Michael Fritch <mfritch@suse.com>
---
src/cephadm/cephadm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 783a7b12db3..c2138b33c5b 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -6013,6 +6013,11 @@ def _parse_args(av):
if __name__ == "__main__":
+ # root?
+ if os.geteuid() != 0:
+ sys.stderr.write('ERROR: cephadm should be run as root\n')
+ sys.exit(1)
+
# Logger configuration
if not os.path.exists(LOG_DIR):
os.makedirs(LOG_DIR)
@@ -6033,11 +6038,6 @@ if __name__ == "__main__":
if handler.name == "console":
handler.setLevel(logging.DEBUG)
- # root?
- if os.geteuid() != 0:
- sys.stderr.write('ERROR: cephadm should be run as root\n')
- sys.exit(1)
-
if 'func' not in args:
sys.stderr.write('No command specified; pass -h or --help for usage\n')
sys.exit(1)