fuel/build/fuel-agent_1.patch

   1 *** build/repos/nailgun/fuel_agent/fuel_agent/manager.py.orig   Thu Sep 24 11:08:38 2015
   2 --- build/repos/nailgun/fuel_agent/fuel_agent/manager.py        Thu Sep 24 11:10:25 2015
   3 ***************
   4 *** 541,546 ****
   5 --- 541,552 ----
   6                       fs_options=fs.options,
   7                       fs_label=fs.label,
   8                       dev=str(fs.device))
   9 +                 if fs.type == 'ext4':
  10 +                     LOG.debug('Trying to disable journaling for ext4 '
  11 +                               'in order to speed up the build')
  12 +                     utils.execute('tune2fs', '-O', '^has_journal',
  13 +                                   str(fs.device))
  14 +
  15
  16               # mounting all images into chroot tree
  17               self.mount_target(chroot, treat_mtab=False, pseudo=False)
  18 ***************
  19 *** 631,636 ****
  20 --- 637,652 ----
  21               self.umount_target(chroot, pseudo=False, try_lazy_umount=False)
  22
  23               for image in self.driver.image_scheme.images:
  24 +                 # find fs with the same loop device object
  25 +                 # as image.target_device
  26 +                 fs = self.driver.partition_scheme.fs_by_device(
  27 +                     image.target_device)
  28 +
  29 +                 if fs.type == 'ext4':
  30 +                     LOG.debug('Trying to re-enable journaling for ext4')
  31 +                     utils.execute('tune2fs', '-O', 'has_journal',
  32 +                                   str(fs.device))
  33 +
  34                   LOG.debug('Deattaching loop device from file: %s',
  35                             image.img_tmp_file)
  36                   bu.deattach_loop(str(image.target_device))