summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/partition.py
diff options
context:
space:
mode:
authorRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>2020-04-19 08:35:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-03 14:13:53 +0000
commit3b06f25a804a8ac4b0a0219649088da22e7a2641 (patch)
treebf29d5aa4d6d095cc1dcfb9a9cac8f58991d9e50 /scripts/lib/wic/partition.py
parent4e7c21160b74d0e63d90cae535ff73579cc4fa8b (diff)
downloadpoky-3b06f25a804a8ac4b0a0219649088da22e7a2641.tar.gz
wic: Fix permissions when using exclude or include path
When parameters include_path or exclude_path are passed to the rootfs plugin, it will copy the partition content into a folder and make all the modifications there. This is done using copyhardlinktree(), which does not take into consideration the content of the pseudo folder, which contains the information about the right permissions and ownership of the folders. This results in a rootfs owned by the user that is running the wic command (usually UID 1000), which makes some rootfs unbootable. This bug can be easily triggerd with the following .wks part / --source rootfs --fstype=ext4 --exclude-path=home And this sequence: $ wic create test-permissions -e core-image-minimal -o test/ $ sudo mount test/test-permissions-202004080823-sda.direct.p1 /mnt $ ls -la /mnt/etc/shadow To fix this we copy the content of the pseudo folders to the new folder and modify the pseudo database using the "pseudo -B" command. If the rootfs is not a rootfs generated by bitbake a warning is shown making the user aware that the permissions on the target might not match what he expects. WARNING: /tmp/test/../pseudo folder does not exist. Usernames and permissions will be invalid Cc: Paul Barker <pbarker@konsulko.com> (From OE-Core rev: 9ea7162e9efc29beacdf1c8f4ec98f4895dd5df6) Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit fd739c15cdba221d9d497d3402b7d929c0be2ca4) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/partition.py')
-rw-r--r--scripts/lib/wic/partition.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 3490b4e75d..6e87770f3a 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -191,7 +191,7 @@ class Partition():
191 (self.mountpoint, self.size, self.fixed_size)) 191 (self.mountpoint, self.size, self.fixed_size))
192 192
193 def prepare_rootfs(self, cr_workdir, oe_builddir, rootfs_dir, 193 def prepare_rootfs(self, cr_workdir, oe_builddir, rootfs_dir,
194 native_sysroot, real_rootfs = True): 194 native_sysroot, real_rootfs = True, pseudo_dir = None):
195 """ 195 """
196 Prepare content for a rootfs partition i.e. create a partition 196 Prepare content for a rootfs partition i.e. create a partition
197 and fill it from a /rootfs dir. 197 and fill it from a /rootfs dir.
@@ -199,8 +199,9 @@ class Partition():
199 Currently handles ext2/3/4, btrfs, vfat and squashfs. 199 Currently handles ext2/3/4, btrfs, vfat and squashfs.
200 """ 200 """
201 p_prefix = os.environ.get("PSEUDO_PREFIX", "%s/usr" % native_sysroot) 201 p_prefix = os.environ.get("PSEUDO_PREFIX", "%s/usr" % native_sysroot)
202 p_localstatedir = os.environ.get("PSEUDO_LOCALSTATEDIR", 202 if (pseudo_dir == None):
203 "%s/../pseudo" % rootfs_dir) 203 pseudo_dir = "%s/../pseudo" % rootfs_dir
204 p_localstatedir = os.environ.get("PSEUDO_LOCALSTATEDIR", pseudo_dir)
204 p_passwd = os.environ.get("PSEUDO_PASSWD", rootfs_dir) 205 p_passwd = os.environ.get("PSEUDO_PASSWD", rootfs_dir)
205 p_nosymlinkexp = os.environ.get("PSEUDO_NOSYMLINKEXP", "1") 206 p_nosymlinkexp = os.environ.get("PSEUDO_NOSYMLINKEXP", "1")
206 pseudo = "export PSEUDO_PREFIX=%s;" % p_prefix 207 pseudo = "export PSEUDO_PREFIX=%s;" % p_prefix