Bug#851475: Please merge "gpt-auto-generator: support LUKS encrypted root partitions" in v232

[Alexander Kurtz]

Hi!

On Mon, 2017-01-16 at 00:51 +0100, Michael Biebl wrote:
> The commit for #859 is part of a massive pull request. A simple
> cherry-pick of 01af8c019a33eb3882f17e3b65e30c4a924fed2a on top of v232
> does produce merge conflicts
> 
> If you want to see this in stretch, you should probably provide a build
> and runtime tested patch. Otherwise it's most likely not going to happen.

Thank you for your quick reply! Please allow me to add some points:

   1. Although the fix for #859 (i.e. 01af8c) is/was part of the huge
      #4879 pull request, the commit itself is fairly self-contained.
   2. They only merge conflicts I get when applying 01af8c on top of
      upstream's v232 [0] tag and Debian's current master branch [1] are
      because of the strjoin-NULL-sentinel issue onto which you recently
      stumbled as well [2] (caused because commit 605405 has not yet been
      applied in Debian).
   3. In fact, if I apply 605405 first, and then 01af8c I get no merge
      conflicts at all, neither on the upstream v232 tag nor on Debian's
      current master branch.

So, I can see two options here:

   1. Resolve the merge conflicts on 01af8c manually, and make sure to
      patch all new strjoin() calls to avoid a bug like #851210 [3]
   2. Try to convince you, to merge commit 605405 first ;-)

I really think that option #2 is the way to go. Not merging commit
605405 has already caused bugs (#851210), will complicate all future
cherry-picks from upstream, and most importantly is a ticking time
bomb: Imagine you're backporting a critical security fix from upstream
in a year or two and the patch applies fine, but unfortunately a new
strjoin() call was added (not removed as that would cause merge
conflicts). Now systemd will start randomly segfaulting...

What do you think?

Best regards

Alexander Kurtz

[0] https://anonscm.debian.org/git/pkg-systemd/systemd.git
[1] https://github.com/systemd/systemd.git
[2] https://anonscm.debian.org/cgit/pkg-systemd/systemd.git/commit/?id=4e9d85b78fd369b0ee8ec8700322ce10f335c219
[3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=851210
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part
URL: <http://alioth-lists.debian.net/pipermail/pkg-systemd-maintainers/attachments/20170116/e33c9150/attachment-0002.sig>