summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2015-02-03 17:40:29 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-24 13:55:04 +0000
commitbefd956ebb2ac0193dde98f8a55444fd3df9ff27 (patch)
treec262bf13c673dd7a64da45fd33306f7957f502d6
parent966634f677af417e310512e547c1d5f7d05c7bbd (diff)
downloadmorph-befd956ebb2ac0193dde98f8a55444fd3df9ff27.tar.gz
Allow the passing of options to fsutils.mount
In order to mount using overlayfs, fsutils.mount needs to take a string of options to pass to the mount command.
-rw-r--r--morphlib/fsutils.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/morphlib/fsutils.py b/morphlib/fsutils.py
index a3b73bf6..87b4cf3b 100644
--- a/morphlib/fsutils.py
+++ b/morphlib/fsutils.py
@@ -46,14 +46,17 @@ def create_fs(runcmd, partition): # pragma: no cover
runcmd(['mkfs.btrfs', '-L', 'baserock', partition])
-def mount(runcmd, partition, mount_point, fstype=None): # pragma: no cover
+def mount(runcmd, partition, mount_point,
+ fstype=None, options=[]): # pragma: no cover
if not os.path.exists(mount_point):
os.mkdir(mount_point)
if not fstype:
fstype = []
else:
fstype = ['-t', fstype]
- runcmd(['mount', partition, mount_point] + fstype)
+ if not type(options) == list:
+ options = [options]
+ runcmd(['mount', partition, mount_point] + fstype + options)
def unmount(runcmd, mount_point): # pragma: no cover