summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMarkus Volk <f_l_k@t-online.de>2021-09-25 20:01:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-12-14 22:49:22 +0000
commitb8623317df2f25d8d90c21ce19060260f3dfd49f (patch)
tree653c90a424522562e8f9a84cad71afeb5f390abc /scripts
parent8967fcbcc4c273e641b4e1c1ebd97d7cf2a065e6 (diff)
downloadpoky-b8623317df2f25d8d90c21ce19060260f3dfd49f.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: 3c8e50b073a1505cc3586ca51dfe1e75338feafc) Signed-off-by: MarkusVolk <f_l_k@t-online.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 7aa678ce804c21dc1dc51b9be442671bc33c4041) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/plugins/imager/direct.py2
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 7e1c1c03ab..2505c13fce 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -115,7 +115,7 @@ class DirectPlugin(ImagerPlugin):
115 updated = False 115 updated = False
116 for part in self.parts: 116 for part in self.parts:
117 if not part.realnum or not part.mountpoint \ 117 if not part.realnum or not part.mountpoint \
118 or part.mountpoint == "/": 118 or part.mountpoint == "/" or not part.mountpoint.startswith('/'):
119 continue 119 continue
120 120
121 if part.use_uuid: 121 if part.use_uuid: