From 543130927ba40a174e8674cca66ae442d5056d76 Mon Sep 17 00:00:00 2001 From: Jonas Bjurel Date: Sat, 3 Oct 2015 17:34:24 +0200 Subject: Moving tag arno.2015.2.0 from genesis to fuel/stable/arno Change-Id: I01b5f9f9125756d80d7ca666bb6d994f2b13d2a0 Signed-off-by: Jonas Bjurel --- fuel/build/fuel-agent_1.patch | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 fuel/build/fuel-agent_1.patch (limited to 'fuel/build/fuel-agent_1.patch') diff --git a/fuel/build/fuel-agent_1.patch b/fuel/build/fuel-agent_1.patch new file mode 100644 index 000000000..b0808966f --- /dev/null +++ b/fuel/build/fuel-agent_1.patch @@ -0,0 +1,36 @@ +*** 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)) -- cgit 1.2.3-korg