[OE-core] [PATCH v2] wic: do not overwrite autogenerated /etc/fstab with original too early

[Maciek Borzecki]

25 lip 2014 17:00 Tom Zanussi <tom.zanussi at intel.com> napisał(a):
>
> On Thu, 2014-07-24 at 19:49 -0500, Tom Zanussi wrote: 
> > On Thu, 2014-07-24 at 14:27 +0200, Maciej Borzecki wrote: 
> > > DirectImageCreator.__write_fstab() generates new /etc/fstab in sysroot 
> > > with rootfs contents. The fstab entries are generated base on the 
> > > initialn contents of /etc/fstab, plus any extra (other than / or 
> > > /boot) partitions listed in *.wks. A backup of original /etc/fstab is 
> > > done in a temp location. Subsequent call to __restore_fstab() restores 
> > > the backup copy, replacing the autogenerated one. 
> > > 
> > > Calling __restore_fstab() before Wic_PartData.prepare() brings back the 
> > > original fstab before the partition image file actually is created. As 
> > > such, the autogenerated /etc/fstab will not make it to the partition. 
> > > 
> > 
> > OK, I knew there was something funny about this, and it wasn't really 
> > fixing the problem.  I also knew that it had previously worked, and 
> > digging around realized that the problem was that the recent patch 'wic: 
> > Extend --rootfs-dir to connect rootfs-dirs' is what actually broke 
> > things. 
> > 
> > So this patch shouldn't be applied - I need to look at it a bit more and 
> > come up with a proper fix.. 
> > 
>
> OK, I take that back - this patch is fine to apply. 
>
> Acked-by: Tom Zanussi <tom.zanussi at intel.com> 
>
> What confused me was that your first patch was clearly wrong, but you 
> moved the __write_fstab() to before .prepare in your second patch, which 
> is correct. 
>
> In the future, for v2 and beyond patches, please note what changed from 
> the previous version.

Sure.

One question though. How do I get the patches into master? I'm not @intel.com perhaps that's why I was a bit confused by the wiki instructions. Would you be able to push all of these changes into your tree, so that they would get to master with later merge?

Thanks,
Maciek