summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>2013-03-19 22:05:23 +0100
committerSage Weil <sage@inktank.com>2013-04-26 13:40:04 -0700
commitbd1036dd83fa2ee4807047fb9c2b414ccc9375eb (patch)
treec647f4aaf87b1f36dec922c973ab37dd64a21457
parent8dd8cbac6f88fcb9d2c6838b9f961c70cccb9288 (diff)
downloadceph-bd1036dd83fa2ee4807047fb9c2b414ccc9375eb.tar.gz
ceph-disk: remove twice defined identical function unmount
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de> (cherry picked from commit 4adf088107586be7b356d1e963570cdab232809e)
-rwxr-xr-xsrc/ceph-disk16
1 files changed, 1 insertions, 15 deletions
diff --git a/src/ceph-disk b/src/ceph-disk
index 20f004558a6..90fbe52ae38 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -517,7 +517,7 @@ def unmount(
log.debug('Unmounting %s', path)
subprocess.check_call(
args=[
- 'umount',
+ '/bin/umount',
'--',
path,
],
@@ -1210,20 +1210,6 @@ def detect_fstype(
return fstype
-def unmount(
- path,
- ):
- try:
- subprocess.check_call(
- args=[
- '/bin/umount',
- '--',
- path,
- ],
- )
- except subprocess.CalledProcessError as e:
- raise UnmountError(e)
-
def mount_activate(
dev,
activate_key_template,