diff -Nru systemd-245.5/debian/changelog systemd-245.5/debian/changelog --- systemd-245.5/debian/changelog 2020-05-19 12:43:50.000000000 -0500 +++ systemd-245.5/debian/changelog 2020-05-22 16:19:23.000000000 -0500 @@ -1,3 +1,11 @@ +systemd (245.5-3ubuntu2) groovy; urgency=medium + + * debian/patches/lp1861941-dont-generate-disk-byuuid-for-bcache-uuid.patch + Skip over by-uuid/by-label symlinks for bcache backing and cache devices + (LP: #1861941) + + -- Ryan Harper Fri, 22 May 2020 16:19:23 -0500 + systemd (245.5-3ubuntu1) groovy; urgency=medium [ Dan Streetman ] diff -Nru systemd-245.5/debian/patches/lp1861941-dont-generate-disk-byuuid-for-bcache-uuid.patch systemd-245.5/debian/patches/lp1861941-dont-generate-disk-byuuid-for-bcache-uuid.patch --- systemd-245.5/debian/patches/lp1861941-dont-generate-disk-byuuid-for-bcache-uuid.patch 1969-12-31 18:00:00.000000000 -0600 +++ systemd-245.5/debian/patches/lp1861941-dont-generate-disk-byuuid-for-bcache-uuid.patch 2020-05-22 16:18:14.000000000 -0500 @@ -0,0 +1,24 @@ +Description: skip disk/by-uuid for bcache devices + blkid reports bcache superblock dev.uuid as a filesystem UUID but it actually + is not a filesystem, it's the UUID of the backing device, which is maintained + at /dev/bcache/by-uuid instead of /dev/disk/by-uuid. +Author: Ryan Harper +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bcache-tools/+bug/1861941 +Forwarded: no +Last-Update: 2020-05-22 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/rules.d/60-persistent-storage.rules ++++ b/rules.d/60-persistent-storage.rules +@@ -109,8 +109,11 @@ KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!= + KERNEL!="sr*", IMPORT{builtin}="blkid" + + # by-label/by-uuid links (filesystem metadata) ++# Skip bcache backing devices, handled in 69-bcache.rules ++ENV{ID_FS_TYPE}=="bcache", GOTO="skip_bcache_fs_type" + ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" + ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" ++LABEL="skip_bcache_fs_type" + + # by-id (World Wide Name) + ENV{DEVTYPE}=="disk", ENV{ID_WWN_WITH_EXTENSION}=="?*", SYMLINK+="disk/by-id/wwn-$env{ID_WWN_WITH_EXTENSION}" diff -Nru systemd-245.5/debian/patches/series systemd-245.5/debian/patches/series --- systemd-245.5/debian/patches/series 2020-05-19 12:43:50.000000000 -0500 +++ systemd-245.5/debian/patches/series 2020-05-22 16:09:39.000000000 -0500 @@ -79,3 +79,4 @@ lp1875708/test-Add-a-test-case-for-15654.patch lp1875708/man-document-the-new-_LINE_BREAK-type.patch meson-initialize-time-epoch-to-reproducible-builds-compat.patch +lp1861941-dont-generate-disk-byuuid-for-bcache-uuid.patch