From c28c0b18240b9dbfa7f05609cb3b552da959ac32 Mon Sep 17 00:00:00 2001 From: James Page Date: Tue, 9 Feb 2016 11:13:00 +0000 Subject: [PATCH] Correctly escape block device paths for systemd Ensure that the leading / is stripped from block device paths before escaping for using in systemd unit names. Fixes: #14706 Signed-off-by: James Page --- src/ceph-disk/ceph_disk/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py index d9277b19e5d7d..c10df9464b944 100755 --- a/src/ceph-disk/ceph_disk/main.py +++ b/src/ceph-disk/ceph_disk/main.py @@ -3854,7 +3854,7 @@ def main_trigger(args): LOG.debug("main_trigger: " + str(args)) if is_systemd() and not args.sync: # http://www.freedesktop.org/software/systemd/man/systemd-escape.html - escaped_dev = args.dev.replace('-', '\\x2d') + escaped_dev = args.dev[1:].replace('-', '\\x2d') service = 'ceph-disk@{dev}.service'.format(dev=escaped_dev) LOG.info('systemd detected, triggering %s' % service) command( -- 2.39.5