From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail5.wrs.com (mail5.windriver.com [192.103.53.11]) by mail.openembedded.org (Postfix) with ESMTP id 2AB09793E9 for ; Thu, 30 Aug 2018 10:03:28 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail5.wrs.com (8.15.2/8.15.2) with ESMTPS id w7UA3TKh030205 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL) for ; Thu, 30 Aug 2018 03:03:29 -0700 Received: from pek-ljiang0-d1.wrs.com (128.224.162.214) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.408.0; Thu, 30 Aug 2018 03:03:27 -0700 From: Jiang Lu To: , Date: Thu, 30 Aug 2018 18:01:20 +0800 Message-ID: <1535623282-13919-6-git-send-email-lu.jiang@windriver.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535623282-13919-1-git-send-email-lu.jiang@windriver.com> References: <1535623282-13919-1-git-send-email-lu.jiang@windriver.com> MIME-Version: 1.0 Subject: [PATCH 5/7] wic:direct:remove same entry when updating fstab 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: Thu, 30 Aug 2018 10:03:28 -0000 Content-Type: text/plain Remove same mountpoint entry when updating fstab. Signed-off-by: Jiang Lu --- meta/recipes-support/wic/files/wic/plugins/imager/direct.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-support/wic/files/wic/plugins/imager/direct.py b/meta/recipes-support/wic/files/wic/plugins/imager/direct.py index f648db4..d3ebc9c 100644 --- a/meta/recipes-support/wic/files/wic/plugins/imager/direct.py +++ b/meta/recipes-support/wic/files/wic/plugins/imager/direct.py @@ -163,6 +163,9 @@ class DirectPlugin(ImagerPlugin): opts = part.fsopts if part.fsopts else "defaults" line = "\t".join([device_name, part.mountpoint, part.fstype, opts, "0", "0"]) + "\n" + for tmpline in fstab_lines: + if part.mountpoint in tmpline: + fstab_lines.remove(tmpline) fstab_lines.append(line) updated = True -- 2.7.4