Skip to content

Commit

Permalink
gpt-auto: discard boot0/1 hw partitions along rpmb
Browse files Browse the repository at this point in the history
/dev/mmcblk0boot0 is a partition found in eMMC
This is not relevant for mounting

This complement the previous fix as reported in
systemd#5806

Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
  • Loading branch information
kwizart committed Jan 24, 2018
1 parent dad105c commit 37673f1
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/shared/dissect-image.c
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,8 @@ int dissect_image(int fd, const void *root_hash, size_t root_hash_size, DissectI
/* Filter out weird MMC RPMB partitions, which cannot reasonably be read, see
* https://github.com/systemd/systemd/issues/5806 */
sysname = udev_device_get_sysname(q);
if (sysname && startswith(sysname, "mmcblk") && endswith(sysname, "rpmb"))
if (sysname && startswith(sysname, "mmcblk") &&
(endswith(sysname, "rpmb") || endswith(sysname, "boot0" ) || endswith(sysname, "boot1")))
continue;

node = udev_device_get_devnode(q);
Expand Down

0 comments on commit 37673f1

Please sign in to comment.