]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: fix shell mount for special files
authorMichael Fritch <mfritch@suse.com>
Mon, 11 May 2020 22:30:34 +0000 (16:30 -0600)
committerSebastian Wagner <sebastian.wagner@suse.com>
Thu, 21 May 2020 21:33:18 +0000 (23:33 +0200)
block/char devs, named pipes, sockets etc

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 72ae06f117d50009baf1dbddacd0805d419f76bc)

src/cephadm/cephadm

index a77a99ab3481f26dce4c66e5027a4cf158bf7f00..205a476fdd76bb193c9f51ef924b0a3f7acdf4da 100755 (executable)
@@ -2790,9 +2790,7 @@ def command_shell():
         mounts[pathify(args.keyring)] = '/etc/ceph/ceph.keyring:z'
     if args.mount:
         mount = pathify(args.mount)
-        filename = ''
-        if os.path.isfile(mount):
-            _, filename = os.path.split(mount)
+        filename = os.path.basename(mount)
         mounts[mount] = '/mnt/{}:z'.format(filename)
     if args.command:
         command = args.command