From: Markus Volk <f_l_k@t-online.de>
To: Alexander Kanavin <alex.kanavin@gmail.com>
Cc: openembedded-core@lists.openembedded.org, ross.burton@arm.com
Subject: Re: [oe-core][PATCH] wic-imager-direct.py: use fstab update also for root device
Date: Thu, 29 Sep 2022 17:10:46 +0200 [thread overview]
Message-ID: <YT8ZIR.9TC1ID633SY71@t-online.de> (raw)
In-Reply-To: <CANNYZj-=0t5jxJq_JhW0gUz5-P_Ni_P0mCjRb0ikRdso-oiN-w@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2365 bytes --]
Sure. I've sent a v2
Am Do, 29. Sep 2022 um 15:08:48 +0200 schrieb Alexander Kanavin
<alex.kanavin@gmail.com>:
> Can you describe in more detail what the problem is (e.g. an example
> of incorrect output), and what changes with this patch?
>
> Alex
>
> On Thu, 29 Sept 2022 at 14:58, Markus Volk <f_l_k@t-online.de
> <mailto:f_l_k@t-online.de>> wrote:
>>
>> Remove the hardcoded root device entry from fstab when updating to
>> avoid duplicate entries.
>>
>> Signed-off-by: Markus Volk <f_l_k@t-online.de
>> <mailto:f_l_k@t-online.de>>
>> ---
>> scripts/lib/wic/plugins/imager/direct.py | 7 ++++++-
>> 1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/scripts/lib/wic/plugins/imager/direct.py
>> b/scripts/lib/wic/plugins/imager/direct.py
>> index da483daed5..fd86a094d9 100644
>> --- a/scripts/lib/wic/plugins/imager/direct.py
>> +++ b/scripts/lib/wic/plugins/imager/direct.py
>> @@ -117,7 +117,7 @@ class DirectPlugin(ImagerPlugin):
>> updated = False
>> for part in self.parts:
>> if not part.realnum or not part.mountpoint \
>> - or part.mountpoint == "/" or not
>> part.mountpoint.startswith('/'):
>> + or not part.mountpoint.startswith('/'):
>> continue
>>
>> if part.use_uuid:
>> @@ -145,6 +145,11 @@ class DirectPlugin(ImagerPlugin):
>> fstab_lines.append(line)
>> updated = True
>>
>> + for line in fstab_lines:
>> + if '/dev/root' in line:
>> + fstab_lines.remove(line)
>> + updated = True
>> +
>> if updated:
>> self.updated_fstab_path = os.path.join(self.workdir,
>> "fstab")
>> with open(self.updated_fstab_path, "w") as f:
>> --
>> 2.34.1
>>
>>
>>
>>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#171187):
> <https://lists.openembedded.org/g/openembedded-core/message/171187>
> Mute This Topic: <https://lists.openembedded.org/mt/93993381/3618223>
> Group Owner: openembedded-core+owner@lists.openembedded.org
> <mailto:openembedded-core+owner@lists.openembedded.org>
> Unsubscribe:
> <https://lists.openembedded.org/g/openembedded-core/unsub>
> [f_l_k@t-online.de <mailto:f_l_k@t-online.de>]
> -=-=-=-=-=-=-=-=-=-=-=-
>
[-- Attachment #2: Type: text/html, Size: 2742 bytes --]
next prev parent reply other threads:[~2022-09-29 15:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-29 12:57 [oe-core][PATCH] wic-imager-direct.py: use fstab update also for root device Markus Volk
2022-09-29 13:08 ` Alexander Kanavin
2022-09-29 15:10 ` Markus Volk [this message]
2022-09-29 15:32 ` Richard Purdie
2022-09-29 15:56 ` Markus Volk
[not found] ` <17195FE5AE38CC13.31922@lists.openembedded.org>
2022-09-29 16:27 ` Markus Volk
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=YT8ZIR.9TC1ID633SY71@t-online.de \
--to=f_l_k@t-online.de \
--cc=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=ross.burton@arm.com \
/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