Comment 11 for bug 1686679

Eric Desrochers (slashd) wrote :

Hi Hua,

Thanks for the quick debdiffs update. It looks good to me now but I still have 2 concerned :

#1 - Why the quilt patch isn't apply on top ? Any particular reason ?
If there is a reason it's totally fine, I just want to raise all the possible SRU team concerned before the final upload in order to have a smooth SRU.

#2 - A "quilt push -a" command revealed a few "Hunk # succeeded at ...."

Seems like "daemon/automount.c" was successfully patched, but it is now patched with an offset of 28 lines (when it applies cleanly when your patch is absent). Seems like the current position of your patch is influencing the application of others.

So basically it returns to concern #1, is this the appropriate position for this patch ? If yes, why (SRU team will most likely ask the same question, so we better have an answer for them) ? If the answer is no, then please make sure your patch is the topmost patch on the current stack of applied patches.

Validation can be made by doing this command :

$ quilt top
<YOUR_PATCH>

* With your patch in current position :
Applying patch remove-kernel-mount.nfs-version-check.patch
patching file daemon/automount.c
Hunk #2 succeeded at 1397 (offset 28 lines).
Hunk #3 succeeded at 2062 (offset 28 lines).
patching file include/mounts.h
patching file modules/replicated.c
patching file lib/mounts.c

* Without your patch :
Applying patch remove-kernel-mount.nfs-version-check.patch
patching file daemon/automount.c
patching file include/mounts.h
patching file modules/replicated.c
patching file lib/mounts.c