Sebastian Ramacher <sramac...@debian.org> (2021-05-17): > > diff -Nru btrfs-progs-5.10.1/debian/changelog > > btrfs-progs-5.10.1/debian/changelog > > --- btrfs-progs-5.10.1/debian/changelog 2021-02-06 00:04:21.000000000 > > +0100 > > +++ btrfs-progs-5.10.1/debian/changelog 2021-05-14 02:52:17.000000000 > > +0200 > > @@ -1,3 +1,9 @@ > > +btrfs-progs (5.10.1-2) unstable; urgency=medium > > + > > + * Fix failure to add new devices via a devmapper path. Closes: #982990 > > + > > + -- Adam Borowski <kilob...@angband.pl> Fri, 14 May 2021 02:52:17 +0200 > > + > > btrfs-progs (5.10.1-1) unstable; urgency=medium > > > > * New upstream bugfix release. > > diff -Nru btrfs-progs-5.10.1/debian/patches/devmapper-path > > btrfs-progs-5.10.1/debian/patches/devmapper-path > > --- btrfs-progs-5.10.1/debian/patches/devmapper-path 1970-01-01 > > 01:00:00.000000000 +0100 > > +++ btrfs-progs-5.10.1/debian/patches/devmapper-path 2021-05-14 > > 02:50:25.000000000 +0200 > > @@ -0,0 +1,24 @@ > > +commit dcfda5527538993dc7b2291cb9b9b9967f3b3c4a > > +Author: David Sterba <dste...@suse.com> > > +Date: Wed Feb 10 16:36:50 2021 +0100 > > + > > + btrfs-progs: fix device mapper path canonicalization > > + > > + Commit 922eaa7b5472 ("btrfs-progs: build: fix linking with static > > + libmount") broke path canonicalization, that prevented eg 'device add > > + /dev/dm-0' to properly recognize the device mapper names. > > + > > + Issue: #339 > > + Signed-off-by: David Sterba <dste...@suse.com> > > + > > +--- btrfs-progs-5.10.1.orig/common/path-utils.c > > ++++ btrfs-progs-5.10.1/common/path-utils.c > > +@@ -325,7 +325,7 @@ char *path_canonicalize(const char *path > > + return strdup(path); > > + p = strrchr(canonical, '/'); > > + if (p && strncmp(p, "/dm-", 4) == 0 && isdigit(*(p + 4))) { > > +- char *dm = path_canonicalize(p + 1); > > ++ char *dm = path_canonicalize_dm_name(p + 1); > > + > > + if (dm) { > > + free(canonical); > > diff -Nru btrfs-progs-5.10.1/debian/patches/series > > btrfs-progs-5.10.1/debian/patches/series > > --- btrfs-progs-5.10.1/debian/patches/series 1970-01-01 > > 01:00:00.000000000 +0100 > > +++ btrfs-progs-5.10.1/debian/patches/series 2021-05-14 > > 02:49:40.000000000 +0200 > > @@ -0,0 +1 @@ > > +devmapper-path > > Cyril, can you please (n)ack for d-i?
Sure, please go ahead. (We only offer minimal support for btrfs in d-i, and I would expect users of this particular feature to do some manual work anyway; I'm happy to trust the package's maintainer with the correctness of the fix.) Cheers, -- Cyril Brulebois (k...@debian.org) <https://debamax.com/> D-I release manager -- Release team member -- Freelance Consultant
signature.asc
Description: PGP signature