From b217eaca34728bf886bced4aa154c527e4322a33 Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Tue, 3 Feb 2015 17:40:29 +0000 Subject: 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. --- morphlib/fsutils.py | 7 +++++-- 1 file 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 -- cgit v1.2.1