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>2020-04-26 14:00:50 +0100
commit90164f0f3d713de70842317869343dd4a3ef5140 (patch)
treedfd8a4b43d3280e3c79acf8b5eb3d556c2395547 /scripts/lib/wic/partition.py
parent3e9cdd878887d0e59754447f313c39d142b71971 (diff)
downloadpoky-90164f0f3d713de70842317869343dd4a3ef5140.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: fd739c15cdba221d9d497d3402b7d929c0be2ca4) Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.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 2d95f78439..b02711be37 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -190,7 +190,7 @@ class Partition():
190 (self.mountpoint, self.size, self.fixed_size)) 190 (self.mountpoint, self.size, self.fixed_size))
191 191
192 def prepare_rootfs(self, cr_workdir, oe_builddir, rootfs_dir, 192 def prepare_rootfs(self, cr_workdir, oe_builddir, rootfs_dir,
193 native_sysroot, real_rootfs = True): 193 native_sysroot, real_rootfs = True, pseudo_dir = None):
194 """ 194 """
195 Prepare content for a rootfs partition i.e. create a partition 195 Prepare content for a rootfs partition i.e. create a partition
196 and fill it from a /rootfs dir. 196 and fill it from a /rootfs dir.
@@ -198,8 +198,9 @@ class Partition():
198 Currently handles ext2/3/4, btrfs, vfat and squashfs. 198 Currently handles ext2/3/4, btrfs, vfat and squashfs.
199 """ 199 """
200 p_prefix = os.environ.get("PSEUDO_PREFIX", "%s/usr" % native_sysroot) 200 p_prefix = os.environ.get("PSEUDO_PREFIX", "%s/usr" % native_sysroot)
201 p_localstatedir = os.environ.get("PSEUDO_LOCALSTATEDIR", 201 if (pseudo_dir == None):
202 "%s/../pseudo" % rootfs_dir) 202 pseudo_dir = "%s/../pseudo" % rootfs_dir
203 p_localstatedir = os.environ.get("PSEUDO_LOCALSTATEDIR", pseudo_dir)
203 p_passwd = os.environ.get("PSEUDO_PASSWD", rootfs_dir) 204 p_passwd = os.environ.get("PSEUDO_PASSWD", rootfs_dir)
204 p_nosymlinkexp = os.environ.get("PSEUDO_NOSYMLINKEXP", "1") 205 p_nosymlinkexp = os.environ.get("PSEUDO_NOSYMLINKEXP", "1")
205 pseudo = "export PSEUDO_PREFIX=%s;" % p_prefix 206 pseudo = "export PSEUDO_PREFIX=%s;" % p_prefix