1
0
mirror of https://github.com/systemd/systemd.git synced 2025-01-24 06:04:05 +03:00

74673 Commits

Author SHA1 Message Date
Yu Watanabe
34bef8dfac network/ndisc: do not override conflicting static routes
We have already ignored conflicting address configurations requested by
NDisc protocol. See ndisc_request_address().
Let's follow the same rule for routes. That is, if there are conflicting
static routes configured or requested, do not override them by NDisc.

Also, swap the order of checking existing route and existing request.

Fixes a regression caused by 972f1d17ab461a51142a142609dd3ec50bae8440.
Prompted by #33346.

(cherry picked from commit 7af3e8cd0034a6eb2e614b052c94c6d0b4556e98)
2024-07-05 20:00:04 +02:00
Mike Yuan
0b909bf685 core/exec-invoke: reopen OpenFile= fds with O_NOCTTY
(cherry picked from commit b9c5d812d5132ea1d6a7146be80d41ae2ccb288e)
2024-07-05 20:00:04 +02:00
Mike Yuan
52371fe526 core: verify WorkingDirectory= is outside of API VFS only under mount namespacing
The purpose of the check is to prevent leaking API VFS fds
from host into a mount namespace/container. When mountns
is not used at all, the check is pointless and causes
inconvenience. E.g. file managers might need to be spawned
under those directories, and they surely won't run in mountns.

Suggested in https://github.com/systemd/systemd/pull/33454#issuecomment-2186351467
Fixes #33361

(cherry picked from commit 276bd392ecdd6febaeac82e7d6f46a035826f98d)
2024-07-05 20:00:04 +02:00
Yu Watanabe
ec5ac3ea53 terminal-util: use colon as separator for specifying color
Then, terminal will safely ignore unsupported features, like colored
underline.

Fixes a regression caused by 891abc9cf1d3d7afd7b740b4077551dcfb5f8e16.
Fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1074073.
Fixes #33449.

(cherry picked from commit 6eabe9f2ff48c1b6924724d5afe64e7b661ccdbf)
2024-07-05 20:00:04 +02:00
Diego Viola
421ccd7094 man: fix double is typo in systemd-tmpfiles
Signed-off-by: Diego Viola <diego.viola@gmail.com>
(cherry picked from commit a78394a49a3bc8eedb9fc2df10c41765bd823c8e)
2024-07-05 20:00:04 +02:00
Nick Rosbrook
778034f42e test: skip test-cgroup-id on ENOSYS from cg_cgroupid_open
Most container managers will block open_by_handle_at with seccomp to
mitigate a container escape attack. LXD in particular returns ENOSYS
rather than e.g. EPERM like nspawn. Skip this test if we get ENOSYS
from open_by_handle_at via cg_cgroupid_open.

(cherry picked from commit 82f57401d933596746c32a955773bc70be53b0ac)
2024-07-05 20:00:04 +02:00
Johannes Schneider
3174fae67b meson: bpf: propagate 'sysroot' for cross compilation
During cross-compilation of systemd, the compiler used to build the bpf's needs
to be pointed at the correct include searchpath. Which can be done by passing
the corresponding directory in through the cflags; for example in yocto/bitbake
this would work: CFLAGS += "--sysroot=${STAGING_DIR_TARGET}"

Signed-off-by: Johannes Schneider <johannes.schneider@leica-geosystems.com>
(cherry picked from commit b608bf5620765de20851eca55cbd6c42ce1af450)
2024-07-05 20:00:04 +02:00
Antonio Alvarez Feijoo
a6906475be kernel-install: correct the place where it works in man and help text
(cherry picked from commit 111f9889927d75b82264fcaf59b99b879a4a8a26)
2024-07-05 20:00:04 +02:00
Maximilian Wilhelm
3e435e970d man/systemd.exec: list inaccessible files for ProtectKernelTunables
(cherry picked from commit 163bb43ceaa1e5bdcda27c4417339b3af9cf28af)
2024-07-05 20:00:04 +02:00
pyfisch
90b5cb35e9 Use consistent spelling of systemd.condition_first_boot argument
(cherry picked from commit 051d462b42fe6c27824046c15cd3c84fa5afe05b)
2024-07-05 20:00:04 +02:00
Mike Yuan
b6316b8fac login/user-runtime-dir: free ignored sd_bus_error, avoid triggering assertion
Fixes #33388

(cherry picked from commit 909ba6907032caee1157a3e3afd53640798ea817)
2024-07-05 20:00:04 +02:00
Mike Yuan
71546deef5 login/user-runtime-dir: use STRLEN where appropriate
Also, add missing trailing / to paths used in STRLEN/sizeof.

(cherry picked from commit 0b8a714b2bb69cba68daec4f742c1b85bbafbdb1)
2024-07-05 20:00:04 +02:00
Lennart Poettering
fbfc88af5e pretty-print: take console glyph width into account when drawing progress bar
So far this used string length, not character width. Fix that.

(cherry picked from commit 1ad4e37da164041605d18c28ee1868cf942f7857)
2024-07-05 20:00:04 +02:00
Luca Boccassi
058fca7e6c mkosi: add support for TEST_SAVE_JOURNAL to integration test wrapper
Same variable and values as supported by the shell suite

(cherry picked from commit 59d4970a552cbc30d7977bdc9eca756b41260875)
2024-07-05 20:00:04 +02:00
Luca Boccassi
50ae476efd semaphore: pin packaging to ci/v256/stable branch
The packaging in debian/master is no longer compatible with v256-stable
so switch it
2024-07-05 11:38:42 +02:00
Luca Boccassi
771bb489bf test: skip TEST-69-SHUTDOWN on Debian
There is a regression in the login package, skip the test until
it is fixed. https://bugs.debian.org/1075733

(cherry picked from commit 92d9d5ca70b0a8b3aea12f24e9cd0f770c31a94c)
2024-07-05 11:38:42 +02:00
Daan De Meyer
69c51768ef meson: Bump version to 256.2~devel
We need this so the packages built in CI are considered more recent
than the stable releases shipped by distributions.
2024-07-05 11:38:42 +02:00
Daan De Meyer
273b5622ac meson: Fix various versions
Follow up for 8b3b01c4b7e0fde39b4be354990ee68f5e612c52

We switch to PROJECT_VERSION instead of PROJECT_VERSION_FULL where
we report our version and which is likely being parsed to avoid
breaking compat. If we didn't, the output would change from systemd
255 to systemd 255.1 which could break various tools.

(cherry picked from commit 6a4fcf8cefceba151e11f85e784c8962b6fc383b)
2024-07-05 11:38:42 +02:00
Chen Qi
9150ffc98a src/boot/efi/meson.build: ensure VERSION_TAG exists in case of cross build
The GIT_VERSION is changed to use VERSION_TAG, but in case of cross build
for src/boot/efi, it's not set, causing build error because the compiler cannot
know it's a macro thus treating it as some variable and error out.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
(cherry picked from commit 646ed5af0013accacac1f4ac048371bebec52f60)
2024-07-05 11:38:42 +02:00
Daan De Meyer
1eb122033f mkosi: Build a disk image by default again
Now that we have a way to rebuild and reinstall systemd without
having to rebuild the image, let's default to building a disk image
again.

(cherry picked from commit 96110261ee7716bf19a6920a4206365614ad3857)
2024-07-05 11:38:42 +02:00
Daan De Meyer
84d6fec8f9 meson: Deal with potential stable versions
The meson.version file might contain e.g. 256.2~devel in a stable
branch so let's make sure we deal with that.

(cherry picked from commit 8b3b01c4b7e0fde39b4be354990ee68f5e612c52)
2024-07-05 11:38:42 +02:00
Luca Boccassi
851f991b1c mkosi: bump to latest commit
(cherry picked from commit ea6376d17f4475d470925adfe7bf1bac577e96b2)
2024-07-05 11:38:42 +02:00
Daan De Meyer
3d3bc1d999 mkosi: Switch back to btrfs
Now that we're running on Noble instead of Jammy btrfs has the temp_fsid
feature which means we can mount the same image multiple times so let's
switch back to btrfs instead of ext4 as the filesystem as btrfs properly
records timestamps when building filesystems from a root directory unlike
ext4.

(cherry picked from commit 93440db8b5eae1244aaf5fecfa68050a8b26f3e3)
2024-07-05 11:38:42 +02:00
Daan De Meyer
ce41fdbfdc mkosi: Install btrfs-progs on CentOS as well
(cherry picked from commit 48e7d0e91e1c9d86c660a67a8ca29aa79deee33d)
2024-07-05 11:38:42 +02:00
Daan De Meyer
1566c15fe4 mkosi: Enable hyperscale-packages-experimental for CentOS
This gets us a kernel with btrfs support.

(cherry picked from commit 6f1f13ca9f8db424c613332ec4739e53b2db6fdf)
2024-07-05 11:38:42 +02:00
Daan De Meyer
33ad0ea834 mkosi: Drop leftover systemd-coredump-debuginfo package for opensuse
The package was merged into the main systemd package in
23bfa9d83b.

(cherry picked from commit 21942c008e6540f2ff905a2c6de35475037e734b)
2024-07-05 11:38:42 +02:00
Daan De Meyer
2286ae91f4 mkosi: Drop s390x console patch from opensuse spec
This patch does not apply anymore on upstream, so let's remove it
from the spec before building until the spec is fixed.

(cherry picked from commit f92a005cd13ee1df95f3ea16e421f7757fb0f424)
2024-07-05 11:38:42 +02:00
Luca Boccassi
7404ba69cf mkosi: use new standalone-shutdown package for debian's exitrd
(cherry picked from commit efd5314c5036cc41f3dde0e2ef33c3cbd4314e3f)
2024-07-05 11:38:42 +02:00
Daan De Meyer
3f0763b5a6 mkosi: update debian commit reference
* 3b4368d4b8 d/not-installed: fix shutdown.standalone path
* 2de05155e8 Update changelog for 256.1-2 release
* cd98bcef06 autopkgtest: add dependency on libcryptsetup-dev in unit-tests suite
* e220ce22f1 Bump breaks/replaces to conflicts for DEP17

(cherry picked from commit 0d40269e5a71d56734eeb30e41fc74c3c0bea7d4)
2024-07-05 11:38:42 +02:00
Luca Boccassi
9d0259e5bc mkosi: bump Debian Salsa commit to latest
(cherry picked from commit 8a91a43197b63e84f6a7439585204a36c70040ba)
2024-07-05 11:38:42 +02:00
Luca Boccassi
87fc64db36 mkosi: install new split-out systemd packages
repart and cryptsetup tools were moved out of the main package
to reduce dependencies.

(cherry picked from commit 621a7fe0647eca4ced4914c1c9beb569678b304b)
2024-07-05 11:38:42 +02:00
Daan De Meyer
245d17d8dd mkosi: update arch commit reference
* d74b24c7c6 meson options: vcs-tag=false
* 7424fedef0 upgpkg: 256.1-1: new upstream release
* 6016864c99 upgpkg: 256-3: rebuild to fix man pages...
* 6f6d48b221 upgpkg: 256-2: update shells
* b9ce44e766 drop systemd-stable repository, build from main one
* baf4803252 upgpkg: 256-1: new upstream release
* 1d75e7ddaa add an install hint on NEWS
* 6f17a23127 Ups, inverted...
* d76029f7cc update meson options
* 6e7929dd98 upgpkg: 256rc4-1: new upstream pre-release - testing only!
* 7b70e7b0e7 upgpkg: 256rc3-2: fast-forward to current git main, non-official testing
* a438b879e2 upgpkg: 256rc3-1: new upstream pre-release, non-official testing
* ff30a600c9 upgpkg: 256rc2-1: new upstream pre-release, non-official testing

(cherry picked from commit cd98453908a9a2e2c7c0dc3064599c8b2184431a)
2024-07-05 11:38:42 +02:00
Luca Boccassi
8717dc0dd4 mkosi: switch opensuse to devel branch
The factory branch seems to have been reset to 9 years ago, switch
to devel

(cherry picked from commit 582718d959c66e3e7108310662ec8ae587ae6862)
2024-07-05 11:38:42 +02:00
Daan De Meyer
6f720b609a mkosi: update fedora commit reference
* f9fe17dbde Use vmlinux.h from kernel-devel
* 9cbad936a6 Pull in openssl-devel-engine
* 8ae009f929 Only add Requires on python3-zstd on Fedora
* 750e910c7c Drop BuildRequires on python3-zstd

(cherry picked from commit 6bd14bf4b3ec85101ba6ce75a4292d61066a5e68)
2024-07-05 11:38:42 +02:00
Daan De Meyer
a09800cd16 mkosi: update fedora commit reference
* 8153d9b0f9 Revert "Remove tmpfiles snippet for /home and /srv"
* a76669ee22 Remove tmpfiles snippet for /home and /srv
* b3e1d52cb4 Soft-disable tmpfiles --purge until a good use case comes up
* 4a29ab3f3b Version 256.1
* ebf352d292 disable auto-features when bootstrapping
* 1ae0516ae7 Version 256
* b32641170e Restore patch to drop varlink method call
* 421f0041b3 Version 256~rc4
* 65d9b49791 Fix typo
* c56891fb68 Drop sysusers.d/basic.conf
* 69472997b9 Renumber sources and make order more consistent

(cherry picked from commit b6a9ad2c62fef8da07d4feb2c0190b4176b2b7b9)
2024-07-05 11:38:42 +02:00
Daan De Meyer
e3703f4327 mkosi: Install zypper in opensuse images
(cherry picked from commit 18c98a839fc589d80eb256428f9eb091bb028171)
2024-07-05 11:38:42 +02:00
Daan De Meyer
a7da351f39 mkosi: Fix sync script git command
Let's make sure we actually operate on the packaging git repo.

(cherry picked from commit d1bbeeea4cd9317ad5915c99641aa9d82c4bc37d)
2024-07-05 11:38:42 +02:00
Daan De Meyer
a39473aac7 mkosi: Clean up old packages from the build directory
(cherry picked from commit 2f6046f66b61e4f12a53d6d93dcd59f25971ccf6)
2024-07-05 11:38:42 +02:00
Luca Boccassi
2e0af5f6fe mkosi: remove conflicting deb packages from builddir
These are not actually needed or installed, so delete them from the
build directory, so that inside an image one can do:

apt install --reinstall /work/build/*.deb

Follow-up for 690a85b1d4e794af62bca6d1ea530ffc530ee58c

(cherry picked from commit ce513c6c6cfbb52dd4736f8074b61d2dfdb2417d)
2024-07-05 11:38:42 +02:00
Daan De Meyer
6a898c35da mkosi: Copy packages to the build directory as well
With the latest mkosi, mkosi -t none can be used to rerun the build
script without messing with a previously built image. This allows
one to run "mkosi -t disk -f qemu" in one terminal to build and boot
an image in qemu and then run "mkosi -t none" in another terminal to
rebuild the packages. If one then has "RuntimeBuildSources=yes" set
in their mkosi configuration, the build directory is mounted into the
virtual machine, which means that one can then run "dnf upgrade
/work/build/*.rpm" from within the VM to install the new packages.

This allows for quickly iterating on changes without having to rebuild
the image all the time.

We'll probably want to document this at some point, but let's start
with making it possible by copying the built packages to the build directory.

(cherry picked from commit 690a85b1d4e794af62bca6d1ea530ffc530ee58c)
2024-07-05 11:38:42 +02:00
Daan De Meyer
16ea64e2be mkosi: Make sure we don't hide errors from git merge-base
Currently if git merge-base fails we'll hide the error and exit with
exit status 0. Let's make we only exit early if git merge-base exits
with 1 which indicates the current commit is not on the target branch.
Any other error is considered fatal.

(cherry picked from commit 2fe6ad5a64bca187712708d41269091c91500a35)
2024-07-05 11:38:42 +02:00
Daan De Meyer
3f42d88faa mkosi: Install perf
It's already installed on ubuntu via linux-tools-common.

(cherry picked from commit cca8c15599b888fc757d7e17a8a8949bca522447)
2024-07-05 11:38:42 +02:00
Daan De Meyer
f2c782c043 mkosi: Install pciutils
(cherry picked from commit 3cdc8da5ad4beb9bdb06e9c6ca3544da410454ce)
2024-07-05 11:38:42 +02:00
Zbigniew Jędrzejewski-Szmek
054fc83a23 mkosi: move variable to the right scope
(cherry picked from commit 3690971cd0d11749e82bc1cb69d5a1e80284ab46)
2024-07-05 11:38:42 +02:00
Daan De Meyer
8abb2e0f55 mkosi: Don't touch the packaging checkout if work is being done
If work is being done in a separate branch, don't touch the packaging
checkout.

(cherry picked from commit 88e92306431bd5928ab4e5c18310e36de9ffa3f6)
2024-07-05 11:38:42 +02:00
Robin Lee
59ab01d32f vmspawn: define QEMU_MACHINE_TYPE for loongarch64
Use ["virt"](https://www.qemu.org/docs/master/system/loongarch/virt.html) as a commonly used generic platform on loongarch64.

(cherry picked from commit 6efab8c343f0881ad9e1800facb0d08594b025ee)
2024-07-05 11:29:46 +02:00
Xeonacid
ba28889c65 vmspawn: define QEMU_MACHINE_TYPE for riscv
Use ["virt"](https://www.qemu.org/docs/master/system/target-riscv.html#board-specific-documentation) as a commonly used generic platform on riscv.

(cherry picked from commit 5f7136a3690cd118eeef3c84dfbd9f5d0df556d6)
2024-07-05 11:29:46 +02:00
Luca Boccassi
715d146a3a docs: fix dead link to GNOME documentation
(cherry picked from commit b22ee1010d4ba2e0049b162483c0f185c367d0bb)
2024-06-28 13:35:58 +01:00
Yu Watanabe
34ba18b012 logs-show: do not use _SOURCE_MONOTONIC_TIMESTAMP field
The timestamp is not in CLOCK_MONOTONIC, but CLOCK_BOOTTIME,
while header monotonic timestamp is in CLOCK_MONOTONIC. Hence, we cannot
adjust timestamp by comparing with header monotonic timestamp and
_SOURCE_MONOTONIC_TIMESTAMP field.

Fixes a regression caused by affde1d7e79a634ee6053dbd4a57b3b51b74c170.
Fixes #33293.

(cherry picked from commit 144498e7e6efe2d90981cb14e3ed462a70a955c6)
v256.1
2024-06-18 20:41:01 +02:00
Antonio Alvarez Feijoo
f8f669fd69 repart: fix memory leak
(cherry picked from commit a81f5ffd40081441dafc678fe83d185436dde35a)
2024-06-18 20:41:01 +02:00