| Message ID | 20221028123050.3910-1-ciaran.courtney@activeenergy.ie |
|---|---|
| State | Accepted, archived |
| Commit | f1243572ad6b6303fe562e4eb7a9826fd51ea3c3 |
| Headers | show |
| Series | wic: swap partitions are not added to fstab | expand |
The commit you're reffering to is absent: https://git.yoctoproject.org/poky/commit/?id=7aa678ce804c21dc1dc51b9be442671bc33c4041 It does not exist either in poky-contrib and on github. BTW I've sent you the snippet from systemd build which shows that swap partition is still being used despite missing fstab entry. My question does not imply that I'm not happy with the patch as direct imager plugin will properly handle swap partition. Thanks! -- With best wishes, [cid:a53ddc99b68f01a67a57538e872ae6389339d5ed.camel@yadro.com-0] Sergei Zhmylev Engineering consultant OS development department В Пт, 28/10/2022 в 13:30 +0100, ciaran.courtney@activeenergy.ie пишет: «Внимание! Данное письмо от внешнего адресата!» From: ciarancourtney <ciaran.courtney@activeenergy.ie<mailto:ciaran.courtney@activeenergy.ie>> - Regression in 7aa678ce804c21dc1dc51b9be442671bc33c4041 Signed-off-by: Ciaran Courtney <ciaran.courtney@activeenergy.ie<mailto:ciaran.courtney@activeenergy.ie>> --- 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 58965b75da..dfaa901567 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 == "/" or not (part.mountpoint.startswith('/') or part.mountpoint == "swap"): continue if part.use_uuid: -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#172254): https://lists.openembedded.org/g/openembedded-core/message/172254 Mute This Topic: https://lists.openembedded.org/mt/94623104/7220546 Group Owner: openembedded-core+owner@lists.openembedded.org<mailto:openembedded-core+owner@lists.openembedded.org> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [s.zhmylev@yadro.com<mailto:s.zhmylev@yadro.com>] -=-=-=-=-=-=-=-=-=-=-=-
On Fri, Oct 28, 2022 at 3:05 PM Sergey Zhmylev <s.zhmylev@yadro.com> wrote: > The commit you're reffering to is absent: > https://git.yoctoproject.org/poky/commit/?id=7aa678ce804c21dc1dc51b9be442671bc33c4041 > It does not exist either in poky-contrib and on github. > https://git.openembedded.org/openembedded-core/commit/?h=7aa678ce804c21dc1dc51b9be442671bc33c4041 It's oe-core commit.
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index 58965b75da..dfaa901567 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 == "/" or not (part.mountpoint.startswith('/') or part.mountpoint == "swap"): continue if part.use_uuid: