From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tom.zanussi@intel.com>
Received: from mga01.intel.com (mga01.intel.com [192.55.52.88])
	by mail.openembedded.org (Postfix) with ESMTP id 770F865DB3
	for <openembedded-core@lists.openembedded.org>;
	Wed, 23 Jul 2014 19:21:42 +0000 (UTC)
Received: from fmsmga001.fm.intel.com ([10.253.24.23])
	by fmsmga101.fm.intel.com with ESMTP; 23 Jul 2014 12:21:43 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.01,718,1400050800"; d="scan'208";a="566203164"
Received: from unknown (HELO [10.255.12.245]) ([10.255.12.245])
	by fmsmga001.fm.intel.com with ESMTP; 23 Jul 2014 12:21:32 -0700
Message-ID: <1406143292.6335.27.camel@empanada>
From: Tom Zanussi <tom.zanussi@intel.com>
To: Maciej Borzecki <maciej.borzecki@open-rnd.pl>
Date: Wed, 23 Jul 2014 14:21:32 -0500
In-Reply-To: <1405978453-16554-1-git-send-email-maciej.borzecki@open-rnd.pl>
References: <1405978453-16554-1-git-send-email-maciej.borzecki@open-rnd.pl>
X-Mailer: Evolution 3.8.5 (3.8.5-2.fc19) 
Mime-Version: 1.0
Cc: Maciek Borzecki <maciek.borzecki@gmail.com>,
	openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 1/2] wic: original fstab restored 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
	<openembedded-core.lists.openembedded.org>
List-Unsubscribe: <http://lists.openembedded.org/mailman/options/openembedded-core>,
	<mailto:openembedded-core-request@lists.openembedded.org?subject=unsubscribe>
List-Archive: <http://lists.openembedded.org/pipermail/openembedded-core/>
List-Post: <mailto:openembedded-core@lists.openembedded.org>
List-Help: <mailto:openembedded-core-request@lists.openembedded.org?subject=help>
List-Subscribe: <http://lists.openembedded.org/mailman/listinfo/openembedded-core>,
	<mailto:openembedded-core-request@lists.openembedded.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Jul 2014 19:21:50 -0000
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit

Sorry, I'm not seeing how this fixes the problem (best would be to
explain that in the patch description too), or for that matter, how to
reproduce the problem.  Could you elaborate?

Tom

On Mon, 2014-07-21 at 23:34 +0200, Maciej Borzecki wrote:
> Contents of /etc/fstab were restored too early, thus overwriting the
> autogenerated ones.
> 
> Signed-off-by: Maciej Borzecki <maciej.borzecki@open-rnd.pl>
> Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
> ---
>  scripts/lib/mic/imager/direct.py | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/lib/mic/imager/direct.py b/scripts/lib/mic/imager/direct.py
> index 2cf4c8d..beae372 100644
> --- a/scripts/lib/mic/imager/direct.py
> +++ b/scripts/lib/mic/imager/direct.py
> @@ -266,7 +266,6 @@ class DirectImageCreator(BaseImageCreator):
>                        self.bootimg_dir, self.kernel_dir, self.native_sysroot)
>  
>              fstab = self.__write_fstab(p.get_rootfs())
> -            self._restore_fstab(fstab)
>  
>              self.__instimage.add_partition(int(p.size),
>                                             p.disk,
> @@ -278,6 +277,9 @@ class DirectImageCreator(BaseImageCreator):
>                                             boot = p.active,
>                                             align = p.align,
>                                             part_type = p.part_type)
> +
> +            self._restore_fstab(fstab)
> +
>          self.__instimage.layout_partitions(self._ptable_format)
>  
>          self.__imgdir = self.workdir