Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Jiang Lu <lu.jiang@windriver.com>
To: <lu.jiang@windriver.com>, <openembedded-core@lists.openembedded.org>
Subject: [PATCH 5/7] wic:direct:remove same entry when updating fstab
Date: Thu, 30 Aug 2018 18:01:20 +0800	[thread overview]
Message-ID: <1535623282-13919-6-git-send-email-lu.jiang@windriver.com> (raw)
In-Reply-To: <1535623282-13919-1-git-send-email-lu.jiang@windriver.com>

Remove same mountpoint entry when updating fstab.

Signed-off-by: Jiang Lu <lu.jiang@windriver.com>
---
 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



  parent reply	other threads:[~2018-08-30 10:03 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-30 10:01 [PATCH 0/7] wic:allow wic compile as an individual package Jiang Lu
2018-08-30 10:01 ` [PATCH 1/7] wic:enable wic compile as " Jiang Lu
2018-08-30 10:01 ` [PATCH 2/7] wic:move wic src into meta/receipt-support/wic Jiang Lu
2018-08-30 10:01 ` [PATCH 3/7] image_type_wic:add wic-native into depend Jiang Lu
2018-08-30 10:01 ` [PATCH 4/7] wic:allow wic run outof bb enviroment Jiang Lu
2018-08-30 10:01 ` Jiang Lu [this message]
2018-08-30 10:01 ` [PATCH 6/7] wic:bootimg-efi:try other place for efi Jiang Lu
2018-08-30 10:01 ` [PATCH 7/7] wic:mkefidisk:add use-uuid for all partitions Jiang Lu
2018-08-30 10:32 ` ✗ patchtest: failure for wic:allow wic compile as an individual package Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2018-08-31  2:15 [v2] [PATCH 0/7] " Jiang Lu
2018-08-31  2:15 ` [PATCH 5/7] wic:direct:remove same entry when updating fstab Jiang Lu
2018-08-31 13:54   ` Tom Rini
2018-09-03  2:00     ` Lu.Jiang
2018-09-03  2:51       ` Tom Rini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1535623282-13919-6-git-send-email-lu.jiang@windriver.com \
    --to=lu.jiang@windriver.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox