v255 batch #440
Merged
v255 batch #440
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
(cherry picked from commit d098b8df6e5c1b4c834272dd1397345483116db6) (cherry picked from commit f6f96b05585ef3b05cef843a2c1cb2c55e77d3ba)
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 4cf7a676af9a79ff418227d8ff488dfca6f243ab) (cherry picked from commit 2e52cf1df7f4a874331dcf607e0f4329ffb20bcd)
(cherry picked from commit 7908e1d459f5f2893d6aaf1d62009da7856f9410) (cherry picked from commit 93759103e6164e69bc92d2ce6c11d79c95da0ced)
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)
In apply_one_mount(), in the MOUNT_EXTENSION_DIRECTORY case, char **extension_release was used as a return pointer twice but only cleaned up once in the end. Fix it by removing duplicate code that was causing this issue. Fixes issue introduced in 55ea4ef. (cherry picked from commit 010ea061fceb84d36259d576f52c09b940d0d615) (cherry picked from commit 83f30941731ca454309c566edbfe3b3bfeaf8453)
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)
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 5121f7c45b37afca53c89f42123b1dd6a04fa80f) (cherry picked from commit c355457fd349549b3f9187a9cb5e7e4bf9b6a184)
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 190a0953808608b099f9465f9e786e4efe276c26) (cherry picked from commit c90ae08b0a5f2844504a109f71dcd773c16d8260)
…rs= is specified Also do not chown if a device node is bind-mounted. Fixes #34243. (cherry picked from commit efedb6b0f3cff37950112fd37cb750c16d599bc7) (cherry picked from commit a23591891b9e85107f39d103eabbb5bc9a6ced6f)
As the seed is used by context_load_partition_table() -> derive_uuid(). Fixes #34257. (cherry picked from commit b8a8000aba4620a1d93ac1d04dbb86050d9c5fe8) (cherry picked from commit f85a4fba330822c44f9b2deb527acecc03bcfed9)
For issue #34257. (cherry picked from commit 56d6ebd40468e2a743b39ad7d87b0675bdf9a042) (cherry picked from commit 69282da9aab90c2dc1e440b04af5b2163779515a)
(cherry picked from commit fe6049d0210c89a595ae598d87dcefe7bfbe3a1d) (cherry picked from commit dda8cb4a8ef702ba526f0c2021c92fa85431330b)
Fixes #34270. (cherry picked from commit 623a8b1922bdbd2fb06bc5f2c67d3d6930efc58e) (cherry picked from commit 34881c9d5afdd05e9e6f1824cbea9d1954ea80c0)
(cherry picked from commit 204529d0fcde9a95119b489225620f36649c2f5b) (cherry picked from commit e80e9dce63787d1d4494ed65d7c27018344387d5)
git restore -s origin/main hwdb.d/ test/hwdb.d (cherry picked from commit f13e3a93d7c2c549ff9a83cdbb04c30ab9e46bea)
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.