diff options
author | Markus Volk <f_l_k@t-online.de> | 2021-09-25 20:01:37 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-26 16:35:00 +0100 |
commit | 37b4fa7a102f1212843411bd1d97202ba9da0e19 (patch) | |
tree | 90076e4f177e0f59dab6df3bf98a3b2da7c1acb2 | |
parent | c4f0ccb5612eb31bb0538673bbf98c3abe28c2cb (diff) | |
download | poky-37b4fa7a102f1212843411bd1d97202ba9da0e19.tar.gz |
wic:direct.py: ignore invalid mountpoints during fstab update
wic fstab-update creates invalid entries for partitons that are not supposed to
be mounted from userspace eg u-boot partitions.
The following lines were added to fstab on a rock-pi-4:
/dev/mmcblk1p1 loader1 vfat defaults 0 0
/dev/mmcblk1p2 reserved1 vfat defaults 0 0
/dev/mmcblk1p3 reserved2 vfat defaults 0 0
/dev/mmcblk1p4 loader2 vfat defaults 0 0
/dev/mmcblk1p5 atf vfat defaults 0 0
/dev/mmcblk1p6 /boot vfat defaults 0 0
With this patch only valid entries should be added
/dev/mmcblk1p6 /boot vfat defaults 0 0
(From OE-Core rev: 7aa678ce804c21dc1dc51b9be442671bc33c4041)
Signed-off-by: MarkusVolk <f_l_k@t-online.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | scripts/lib/wic/plugins/imager/direct.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index 9d10ec01d0..495518fac8 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py | |||
@@ -117,7 +117,7 @@ class DirectPlugin(ImagerPlugin): | |||
117 | updated = False | 117 | updated = False |
118 | for part in self.parts: | 118 | for part in self.parts: |
119 | if not part.realnum or not part.mountpoint \ | 119 | if not part.realnum or not part.mountpoint \ |
120 | or part.mountpoint == "/": | 120 | or part.mountpoint == "/" or not part.mountpoint.startswith('/'): |
121 | continue | 121 | continue |
122 | 122 | ||
123 | if part.use_uuid: | 123 | if part.use_uuid: |