]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Correctly escape block device paths for systemd 7579/head
authorJames Page <james.page@ubuntu.com>
Tue, 9 Feb 2016 11:13:00 +0000 (11:13 +0000)
committerJames Page <james.page@ubuntu.com>
Tue, 9 Feb 2016 11:13:00 +0000 (11:13 +0000)
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 <james.page@ubuntu.com>
src/ceph-disk/ceph_disk/main.py

index d9277b19e5d7ddccc36dc44a24b715d9c1c56d24..c10df9464b944aa727f4a6fcd0f2ab3487671b9f 100755 (executable)
@@ -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(