v253 batch #442
Merged
v253 batch #442
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
testing/sid is merged-usr via base-files now, so debootstrap fails. Update the option on the fly. (cherry picked from commit 7ca567c)
Unprivileged users often make themselves root by unsharing a user namespace and then mapping their current user to root which does not require privileges. Let's make sure our tests don't fail in such an environment by adding checks where required to see if we're not running in a user namespace with only a single user. (cherry picked from commit ef31767ed7e21672a50b77e7b3935948aaba114c) (cherry picked from commit ec5cdf9ba0e003de6f824a000c0bbe46fb4e0925) (cherry picked from commit 4d4513c) (cherry picked from commit 1c514e7)
Builds with kernels headers < 4.14 fail with:
../src/shared/loop-util.c: In function ‘loop_configure_fallback’:
../src/shared/loop-util.c:237:31: error: ‘LOOP_SET_BLOCK_SIZE’ undeclared (first use in this function); did you mean ‘LOOP_SET_DIRECT_IO’?
if (ioctl(fd, LOOP_SET_BLOCK_SIZE, (unsigned long) c->block_size) < 0)
^~~~~~~~~~~~~~~~~~~
LOOP_SET_DIRECT_IO
Fixes: systemd/systemd#33341
Signed-off-by: Raphaël Mélotte <[email protected]>
(cherry picked from commit 56ab1c54497d9fac74380ff9e11aaf931a917d2b)
(cherry picked from commit 0730ec4f3ecbbb550864ff0dbadeeeb5e271eb50)
(cherry picked from commit ed087e8)
(cherry picked from commit e9e2923)
arg_root defaults to null, so if --root isn't given, this would try reading etc/machine-info from the current working directory, which is likely to fail. Fixes: 77db9ef ("boot: Make sure we take --root into account everywhere.") (cherry picked from commit 0452779b0054f5c2724b745b1db33bba1ac8e677) (cherry picked from commit 8d7eef9ee5ead7c7b47b2ad4418529ac5cf17bb3) (cherry picked from commit a573fd1) (cherry picked from commit 0b6faf9)
When the bypass logic is invoked, such as for queries to the stub with the DO bit set, be certain to clear the AD bit in the reply before forwarding it if the answer is not known to be authentic. (cherry picked from commit 13e15dae9f0b4566d3ea2ed058a5dd44751216da) (cherry picked from commit 3a2be652282db2d55d5e28546e6c9a594fb8c43e) (cherry picked from commit 6c243bb) (cherry picked from commit edec5cc)
Otherwise, when merging multiple directory trees, the output becomes unreproducible as the directory timestamps will be changed to the current time when copying identical directories from the second tree. We introduce a new copy flag to achieve this behavior. (cherry picked from commit d850a544bc1f895decb452160c97a884a20b12b7) (cherry picked from commit d5640c4f8583de2752a7f4e03006a1fa74942da1) (cherry picked from commit 7a3b3ad) (cherry picked from commit 87cc4d9)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.