From: Nicolas Chauvet Date: Wed, 24 Jan 2018 09:05:28 +0000 (+0100) Subject: gpt-auto: discard boot0/1 hw partitions along rpmb X-Git-Tag: v237~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3a3b6131eb2c44b3b94df973e6edd2e4c8d2095;p=thirdparty%2Fsystemd.git gpt-auto: discard boot0/1 hw partitions along rpmb /dev/mmcblk0boot0 is a partition found in eMMC This is not relevant for mounting This complement the previous fix as reported in https://github.com/systemd/systemd/issues/5806 Signed-off-by: Nicolas Chauvet --- diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index 1f0579f548f..86114e3dd19 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -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);