From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mail.openembedded.org (Postfix) with ESMTP id 3A2D1701AC for ; Fri, 25 Jul 2014 15:57:39 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 25 Jul 2014 08:57:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,731,1400050800"; d="scan'208";a="549039901" Received: from unknown (HELO [10.255.12.245]) ([10.255.12.245]) by orsmga001.jf.intel.com with ESMTP; 25 Jul 2014 08:57:39 -0700 Message-ID: <1406303860.6205.31.camel@empanada> From: Tom Zanussi To: Maciek Borzecki Date: Fri, 25 Jul 2014 10:57:40 -0500 In-Reply-To: <20140725155210.BD8A0F26628@open-rnd.nazwa.pl> References: <20140725155210.BD8A0F26628@open-rnd.nazwa.pl> X-Mailer: Evolution 3.8.5 (3.8.5-2.fc19) Mime-Version: 1.0 Cc: Maciek Borzecki , openembedded-core@lists.openembedded.org Subject: Re: [PATCH v2] wic: do not overwrite autogenerated /etc/fstab with original too early X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jul 2014 15:57:48 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit On Fri, 2014-07-25 at 17:48 +0200, Maciek Borzecki wrote: > 25 lip 2014 17:00 Tom Zanussi 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 > > > > 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? > They get pulled into master by Richard and Saul, no need to do anything else on your side (except ping them if you don't see them get merged in a reasonable timeframe ;-) Tom > Thanks, > Maciek