In bundling host make sure that the default mount options are enabled
in the newly created file system.
mount = get_command('mount')
umount = get_command('umount')
blkid = get_command('blkid')
mount = get_command('mount')
umount = get_command('umount')
blkid = get_command('blkid')
+tune2fs = get_command('tune2fs')
MKFS_OPTS = {'ext2': ['-F'],
'ext3': ['-F'],
MKFS_OPTS = {'ext2': ['-F'],
'ext3': ['-F'],
def _mount(self, target, devs):
"""Mount a list of filesystems in mountpoints relative to target"""
devs.sort(key=lambda d: d[1])
def _mount(self, target, devs):
"""Mount a list of filesystems in mountpoints relative to target"""
devs.sort(key=lambda d: d[1])
- for dev, mpoint in devs:
+ for dev, mpoint, options in devs:
absmpoint = os.path.abspath(target + mpoint)
if not os.path.exists(absmpoint):
os.makedirs(absmpoint)
absmpoint = os.path.abspath(target + mpoint)
if not os.path.exists(absmpoint):
os.makedirs(absmpoint)
+
+ if len(options) > 0:
+ mount(dev, absmpoint, '-o', ",".join(options))
+ else:
+ mount(dev, absmpoint)
def _umount_all(self, target):
"""Unmount all filesystems that are mounted under the directory target
def _umount_all(self, target):
"""Unmount all filesystems that are mounted under the directory target
for p in self.disk.partitions:
filesystem[p.number] = self._get_mount_options(p.path)
for p in self.disk.partitions:
filesystem[p.number] = self._get_mount_options(p.path)
+ orig_dev[p.number] = p.path
unmounted = filter(lambda p: filesystem[p.num] is None, partitions)
mounted = filter(lambda p: filesystem[p.num] is not None, partitions)
unmounted = filter(lambda p: filesystem[p.num] is None, partitions)
mounted = filter(lambda p: filesystem[p.num] is not None, partitions)
self.out.success("done")
loop = str(losetup('-f', '--show', image)).strip()
self.out.success("done")
loop = str(losetup('-f', '--show', image)).strip()
+
+ # Recreate mounted file systems
mapped = {}
try:
for p in mounted:
mapped = {}
try:
for p in mounted:
self.out.output('Creating %s filesystem on partition %d ... ' %
(fs, i), False)
get_command('mkfs.%s' % fs)(*(MKFS_OPTS[fs] + [dev]))
self.out.output('Creating %s filesystem on partition %d ... ' %
(fs, i), False)
get_command('mkfs.%s' % fs)(*(MKFS_OPTS[fs] + [dev]))
+
+ # For ext[234] enable the default mount options
+ if re.match('^ext[234]$', fs):
+ mopts = filter(
+ lambda p: p.startswith('Default mount options:'),
+ tune2fs('-l', orig_dev[i]).splitlines()
+ )[0].split(':')[1].strip().split()
+
+ if not (len(mopts) == 1 and mopts[0] == '(none)'):
+ for opt in mopts:
+ tune2fs('-o', opt, dev)
+
self.out.success('done')
new_uuid[i] = blkid(
'-s', 'UUID', '-o', 'value', dev).stdout.strip()
target = tempfile.mkdtemp()
self.out.success('done')
new_uuid[i] = blkid(
'-s', 'UUID', '-o', 'value', dev).stdout.strip()
target = tempfile.mkdtemp()
+ devs = []
+ for i in mapped.keys():
+ fs = filesystem[i].fs
+ mpoint = filesystem[i].mpoint
+ opts = []
+ for opt in filesystem[i].opts.split(','):
+ if opt in ('acl', 'user_xattr'):
+ opts.append(opt)
+ devs.append((mapped[i], mpoint, opts))
- self._mount(
- target,
- [(mapped[i], filesystem[i].mpoint) for i in mapped.keys()])
+ self._mount(target, devs)
excluded = self._to_exclude()
excluded = self._to_exclude()