public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Anton Mikanovich <amikan@ilbers.de>
To: isar-users@googlegroups.com
Cc: Anton Mikanovich <amikan@ilbers.de>
Subject: [PATCH 3/4] Revert "Revert "wic/plugins/images/direct: Allow changes in fstab on rootfs""
Date: Wed,  8 May 2024 17:38:00 +0300	[thread overview]
Message-ID: <20240508143801.557383-4-amikan@ilbers.de> (raw)
In-Reply-To: <20240508143801.557383-1-amikan@ilbers.de>

Commit a4237f08 was reverted in oe-core, but still needs in Isar.
Revert it back until other implementation will be done.

This reverts commit 045e0da5ef147d3e9e0dc4ea8db95c0746984efa.
---
 scripts/lib/wic/plugins/imager/direct.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index a1d15265..33a869ec 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 part.mountpoint == "swap"):
+               or not (part.mountpoint.startswith('/') or part.mountpoint == "swap"):
                 continue
 
             if part.use_uuid:
-- 
2.34.1


  parent reply	other threads:[~2024-05-08 14:38 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-08 14:37 [PATCH 0/4] Update WIC to the latest revision Anton Mikanovich
2024-05-08 14:37 ` [PATCH 1/4] Revert "wic/plugins/images/direct: Allow changes in fstab on rootfs" Anton Mikanovich
2024-05-08 14:37 ` [PATCH 2/4] wic: Update to the latest revision Anton Mikanovich
2024-05-08 14:38 ` Anton Mikanovich [this message]
2024-05-08 14:46   ` [PATCH 3/4] Revert "Revert "wic/plugins/images/direct: Allow changes in fstab on rootfs"" Anton Mikanovich
2024-05-08 14:38 ` [PATCH 4/4] wic: Restore compatibility with old distros Anton Mikanovich

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=20240508143801.557383-4-amikan@ilbers.de \
    --to=amikan@ilbers.de \
    --cc=isar-users@googlegroups.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