summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>2013-03-19 22:02:49 +0100
committerSage Weil <sage@inktank.com>2013-04-26 13:40:04 -0700
commit8dd8cbac6f88fcb9d2c6838b9f961c70cccb9288 (patch)
tree0e6139370ef200fe55dd6a23ad817d1be403941c
parent0da87db1c0e4b44b69c19b718d89e7a621979009 (diff)
downloadceph-8dd8cbac6f88fcb9d2c6838b9f961c70cccb9288.tar.gz
ceph-disk: remove twice defined function mount
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit ea26ea0d81a23aa76076ad5441c3b1aadfba3b44)
-rwxr-xr-xsrc/ceph-disk34
1 files changed, 0 insertions, 34 deletions
diff --git a/src/ceph-disk b/src/ceph-disk
index f5fb78c0764..20f004558a6 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -1210,40 +1210,6 @@ def detect_fstype(
return fstype
-def mount(
- dev,
- fstype,
- options,
- ):
- # pick best-of-breed mount options based on fs type
- if options is None:
- options = MOUNT_OPTIONS.get(fstype, '')
-
- # mount
- path = tempfile.mkdtemp(
- prefix='mnt.',
- dir='/var/lib/ceph/tmp',
- )
- try:
- subprocess.check_call(
- args=[
- '/bin/mount',
- '-o', options,
- '--',
- dev,
- path,
- ],
- )
- except subprocess.CalledProcessError as e:
- try:
- os.rmdir(path)
- except (OSError, IOError):
- pass
- raise MountError(e)
-
- return path
-
-
def unmount(
path,
):