diff options
author | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-10-03 16:54:43 +0200 |
---|---|---|
committer | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-10-03 16:54:43 +0200 |
commit | 11dbe27afb96c5b54b9f4f0a1c8b21194f59dc7b (patch) | |
tree | 1ee6814c36c7af010cff9d67a1cf1643b233a378 /fuel/build/fuel-agent_1.patch | |
parent | 0d4a1f4143d71fc616f456a3708d5c8c2a24ec3f (diff) |
Moving tag arno.2015.1.0 from genesis to fuel/stable/arnoarno.2015.1.0
Change-Id: I8bb3e28a814e04ad15e8a4b24b40bd7685600f46
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Diffstat (limited to 'fuel/build/fuel-agent_1.patch')
-rw-r--r-- | fuel/build/fuel-agent_1.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/fuel/build/fuel-agent_1.patch b/fuel/build/fuel-agent_1.patch deleted file mode 100644 index b0808966f..000000000 --- a/fuel/build/fuel-agent_1.patch +++ /dev/null @@ -1,36 +0,0 @@ -*** build/repos/nailgun/fuel_agent/fuel_agent/manager.py.orig Thu Sep 24 11:08:38 2015 ---- build/repos/nailgun/fuel_agent/fuel_agent/manager.py Thu Sep 24 11:10:25 2015 -*************** -*** 541,546 **** ---- 541,552 ---- - fs_options=fs.options, - fs_label=fs.label, - dev=str(fs.device)) -+ if fs.type == 'ext4': -+ LOG.debug('Trying to disable journaling for ext4 ' -+ 'in order to speed up the build') -+ utils.execute('tune2fs', '-O', '^has_journal', -+ str(fs.device)) -+ - - # mounting all images into chroot tree - self.mount_target(chroot, treat_mtab=False, pseudo=False) -*************** -*** 631,636 **** ---- 637,652 ---- - self.umount_target(chroot, pseudo=False, try_lazy_umount=False) - - for image in self.driver.image_scheme.images: -+ # find fs with the same loop device object -+ # as image.target_device -+ fs = self.driver.partition_scheme.fs_by_device( -+ image.target_device) -+ -+ if fs.type == 'ext4': -+ LOG.debug('Trying to re-enable journaling for ext4') -+ utils.execute('tune2fs', '-O', 'has_journal', -+ str(fs.device)) -+ - LOG.debug('Deattaching loop device from file: %s', - image.img_tmp_file) - bu.deattach_loop(str(image.target_device)) |