summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian C. (anrxc) <anrxc@sysphere.org>2010-06-12 21:12:33 (GMT)
committerAdrian C. (anrxc) <anrxc@sysphere.org>2010-06-12 21:13:02 (GMT)
commit0fb7586146389df5e4503254217a8c3dcdb0573b (patch)
treedf0467e23e8c914d2f3845f804c7cbd537ae83ef
parent74af43cb45c251b746a24f76001f2fb6c30d07e5 (diff)
downloadrybackup-0fb7586146389df5e4503254217a8c3dcdb0573b.tar.xz
rybackup: recover from early eCryptfs mounts
-rwxr-xr-xrybackup.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/rybackup.py b/rybackup.py
index a5ddf91..47dbb2f 100755
--- a/rybackup.py
+++ b/rybackup.py
@@ -126,13 +126,13 @@ def sync(arg):
# Managing mount points
def mount(action):
- if bak['efs']:
- # Exit with EAGAIN if eCryptfs is mounted
- if call("%s -qs ecryptfs %s"
- % (bin['grep'], files['mounts']), shell=True) == 0:
- raise SystemExit(11)
-
if action == "mount":
+ if bak['efs']:
+ # Exit with EAGAIN if eCryptfs is mounted
+ if call("%s -qs ecryptfs %s"
+ % (bin['grep'], files['mounts']), shell=True) == 0:
+ raise SystemExit(11)
+
# Include the export for NFS
if rmt['fst'] == "-t nfs":
rmt['dev'] = "%s:%s" % (rmt['dev'], rmt['dst'])