X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=account.py;h=b2f9714e264c6e5fa1ece13e531075ba5c62d347;hb=refs%2Fheads%2Fipv6;hp=6030ebe3eb33a1ebf1ec3ea9c88b5ea7a4c40dcc;hpb=db1f4974bb5e2f250152890207c9164f8fa4a852;p=nodemanager.git diff --git a/account.py b/account.py index 6030ebe..b2f9714 100644 --- a/account.py +++ b/account.py @@ -150,14 +150,16 @@ class Account: if not os.path.isdir (path): raise Exception if not is_mounted(root_ssh): - # xxx perform mount - subprocess.call("mount --bind -o ro %s %s"%(root_ssh,sliver_ssh),shell=True) - logger.log("_manage_ssh_dir: mounted %s into slice %s"%(root_ssh,slicename)) + command=['mount','--bind','-o','ro',root_ssh,sliver_ssh] + mounted=logger.log_call (command) + msg="OK" if mounted else "WARNING: FAILED" + logger.log("_manage_ssh_dir: mounted %s into slice %s - %s"%(root_ssh,slicename,msg)) else: - if is_mounted (root_ssh): - # xxx perform umount - subprocess.call("umount %s"%(root_ssh),shell=True) - logger.log("_manage_ssh_dir: umounted %s"%(root_ssh)) + if is_mounted (sliver_ssh): + command=['umount',sliver_ssh] + umounted=logger.log_call(command) + msg="OK" if umounted else "WARNING: FAILED" + logger.log("_manage_ssh_dir: umounted %s - %s"%(sliver_ssh,msg)) except: logger.log_exc("_manage_ssh_dir failed",name=slicename)