1
0
mirror of https://github.com/systemd/systemd.git synced 2025-01-05 13:18:06 +03:00
Commit Graph

74918 Commits

Author SHA1 Message Date
Daan De Meyer
d1f11d909f Add %posttrans versions of the systemd %postun scriptlets
On upgrades, only the %postun scriptlets of the old package version
run. This means that any changes related to restarting daemons require
two releases before they're actually used.

%postun is used because it runs after the old package has been removed,
which is important as it means any lingering dropins from the old package
will have been removed as well.

To allow deploying fixes in just a single release while still running after
the old package has been removed, let's introduce %posttrans versions of these
scriptlets as %posttrans of the new package runs on upgrade and install after
the old package has been removed.

(cherry picked from commit 9fd8a9dffe)
2024-10-08 16:39:12 +01:00
Daniel Dawson
7323feef9b systemd-integritysetup: accept integrity-algorithm=xxhash64
Signed-off-by: Daniel Dawson <danielcdawson@gmail.com>
(cherry picked from commit 0c96911afb)
2024-10-08 16:39:12 +01:00
Lennart Poettering
4bdbfb3dd4 man: add a comment that inode type policy might be enforces via an LSM or similar
Just to tighten the language a bit, why people should care about where
they place their inodes.

(cherry picked from commit 5b53894123)
2024-10-08 16:39:12 +01:00
Lennart Poettering
c14890f588 man: clarify that the defined file hiearchy is just a skeleton
(And specifically mention /usr/include + /var/spool as not covered here,
but being OK to add downstream)

(cherry picked from commit fd6e079e7b)
2024-10-08 16:39:12 +01:00
Lennart Poettering
82783a3c5f man: drop /var/spool/ mention from file-hierarchy(7) man page
Today it seems this is mostly used by mail and printer servers, and it's
not clear to me at all what the property is that makes
/var/spool/<package> the better place for the relevant data than
/var/lib/<package>.

Hence, in the interest of shortening the spec, let's not mention the dir
anymore. In particular as the dir really isn't used by us much, for
example we do not have a counterpart for RuntimeDirectory=,
StateDirectory=, … that would cover the spool.

Since most systems these days we care about probably come *without* a
printer or mail server, let's maybe no mention this in the man page that
is supposed to discuss the rough skeleton how things are set up. After
all, people are supposed to exend the skeleton with their stuff, and
this sounds more like a case for an extension of the skeleton instead of
being considered part of the skeleton itself.

(cherry picked from commit b0201b36d2)
2024-10-08 16:39:12 +01:00
Lennart Poettering
e5ac408af7 man: drop mention of /usr/include/ from file-hierarchy(7) man page
The man page is supposed to provide a "generalized, though minimal and
modernized subset" (as per introductory pargapraghs), from a systemd
perspective. But the thing is that /usr/include/ really doesn't matter
to us. It's a development thing, and slightly weird (because it arguably
would be better places in /usr/share/include/ or so). It's not going to
be there on 95% of deployed systems, and we really don't want people to
bother with it on such systems.

We only define the skeleton of directories in this document, and it's
expected that people extend it, and I think this really should be one of
those dirs that is an extension of our skeleton, but not part of the
skeleton, if that makes any sense.

(cherry picked from commit 9e7b691073)
2024-10-08 16:39:12 +01:00
David Tardon
8a7f34d809 logind-dbus: really cancel scheduled shutdown
Fixes #34554

(cherry picked from commit cd9c3327cb)
2024-10-08 16:39:12 +01:00
Daan De Meyer
36ada59d2e repart: Apply denylist to individual files as well
(cherry picked from commit 0bbe63fc66)
2024-10-08 16:39:12 +01:00
Zbigniew Jędrzejewski-Szmek
28ced52894 systemctl: fix printing of RootImageOptions
The type is a(ss), so a custom printer is required.

Fixes https://github.com/systemd/systemd/issues/33967.

(cherry picked from commit 69c751c61c)
2024-10-08 16:39:12 +01:00
Mickaël Salaün
c53c1a0fac seccomp-util: include @sandbox in @default
Every services and containers should be able to protect their users and
limit the impact of security bugs thanks to the security syscalls
provided by seccomp and Landlock.  The goal of these syscalls is to
improve security with additional restrictions.  They are designed to be
safely used by unprivileged (and then potentially malicious) users.

Remove the now-redundant "seccomp" entry for nspawn.

(cherry picked from commit e996663475)
2024-10-08 16:39:12 +01:00
Zbigniew Jędrzejewski-Szmek
53b5032ffd man: fix formatting in file-hierarchy
Somebody wrapped the text, but whitespace is preserved in <programlisting>, so
the output was mangled. It also doesn't make sense to run systemd-path as root
(as indicated by '#'), so drop that. Also, this chunk should be a separate
paragraph.

(cherry picked from commit 1ca81b2e00)
2024-10-08 16:39:12 +01:00
Daan De Meyer
bb9b6a9067 mkosi: update arch commit reference
* d5a2dc54da Use vmlinux.h from linux-headers
* 59912d804f update checksums...
* 83edb5244e build: set ssh privsep dir to /usr/share/empty.sshd
* 65363cc5ba build: explicitly enable vmlinux-h=generated
* 14e6d27dd4 build: drop deprecated default-hierarchy option
* 81e7545ca3 systemd.install: stop applying ACL ourselves
* 147c214201 systemd-hook: use systemd-notify --booted to detect if systemd is running
* 010bc3c05c upgpkg: 256.6-1: new upstream release

(cherry picked from commit 5acca1b885)
2024-10-08 16:39:12 +01:00
Nils K
c1431b7eff Fix reference to FileDescriptorStoreMax= directive
(cherry picked from commit 543015a164)
2024-10-08 16:39:12 +01:00
Ivan Kruglov
0cd10d410b machine: resolve race condition in TEST-13-NSPAWN.machinectl.sh
I encountered this race condition while working on TEST-13-NSPAWN.varlinkctl.sh.
The long-running machine's init script sometimes does not have time to start and
register signals. As result, occasiounally failed tests.

(cherry picked from commit e826a8bed4)
2024-10-08 16:39:12 +01:00
Simon Pilkington
bc0ba0030b creds: fix cat with encrypted credentials
Fixes: https://github.com/systemd/systemd/issues/34547
(cherry picked from commit 32951fe4de)
2024-10-08 16:39:12 +01:00
Daan De Meyer
4143bc70ed repart: Determine verity sig size based on partition designator
Verity= is an image build concept, not a first boot concept, whereas
a partition designator is always available, so let's do the size stuff
based on that.

(cherry picked from commit e11745d000)
2024-10-08 16:39:12 +01:00
Michal Koutný
00dfa7964b core/cgroup: Apply IODevice*= directives in configured order
Different device paths may resolve to same device node
(lookup_block_device()), e.g.
        IOReadBandwidthMax=/dev/sda1 18879
        IOReadBandwidthMax=/dev/sda2 18878
where both partitions resolve to /dev/sda and when these values are
applied (they are associated with original paths, i.e. as if applied for
different device) in the order from io_device_limits.

The parsing code prepends, so they end up in reverse order wrt config
file. Switch the direction so that the order of application matches the
order of configuration -- i.e. semantics in all other unit file
directives.

Apply same change to all directives that use per-device lists. (The
question whether partitions should be resolved to base device is
independent.)

And apply the changes equally to DBus properties write handlers.

Fixes #34126

(cherry picked from commit 0fa0dfa044)
2024-10-08 16:39:12 +01:00
Ivan Shapovalov
1a08b86723 core/cgroup: cache IO accounting data when pruning a cgroup
When removing a cgroup in unit_prune_cgroup(), read IO metrics to cache
them similar to the existing treatment of the CPU and memory usage data.

Note that we do not do this for the IP metrics as the firewall objects
are only destroyed in unit_free() and thus stay alive long enough to
be read out directly by all interested parties.

Fixes #26988.

(cherry picked from commit 17bbdefd8c)
2024-10-08 16:39:12 +01:00
Ivan Shapovalov
a0d60f5621 core/cgroup: drop allow_cache parameter in unit_get_io_accounting()
The name of the parameter is misleading and it does not save us much
work because it is not used during regular unit property queries.
It is only used during unit_log_resources(), and the cgroup is already
dead by that point so it won't be read anyway.

(cherry picked from commit a0020ad84b)
2024-10-08 16:39:12 +01:00
Zbigniew Jędrzejewski-Szmek
2cd8079efa man: say that SYSEXT_SCOPE=initrd also applies to exitrds
We generally do _not_ want the same sysexts to be loaded in both initrd and
exitrd phases. The environment is completely different and it's unlikely that
the same code can be useful in both places. Nevertheless, it can be useful in
_some_ cases, for example when the sysexts contains debugging tools.

I think we don't need to differentiate between initrds and exitrds through
SYSEXT_SCOPE, because the two types are made available in completely different
locations and loaded through a different mechanism, with very little chance of
an initrd being loaded as an exitrd without an explicit admin action (or the
other way around). So let's not complicate our code or definitions by an
explicit "exitrd" sysext designator, but just clarify that "initrd" also
encompasses exitrds in this context.

(cherry picked from commit 7352a0093f)
2024-10-08 16:39:12 +01:00
Zbigniew Jędrzejewski-Szmek
b78f99e71b man: slightly enhance docs about "exitrd" and remove TODO entry for it
The concept is fairly well established and present in our docs in various
places.

Say that the exitrd is also marked by the presence of /etc/initrd-release.

(cherry picked from commit ace26a511f)
2024-10-08 16:39:12 +01:00
Daan De Meyer
08cf1c5ce5 repart: Add a log message when we're about to fsync().
(cherry picked from commit f3b8e81f54)
2024-10-08 16:39:12 +01:00
Daan De Meyer
abd6cd1b69 mkosi: Add missing SPDX line
(cherry picked from commit 80d4ea4457)
2024-10-08 16:39:12 +01:00
Daan De Meyer
1ade483044 mkosi: Add back support for running clangd within mkosi
This allows hacking on systemd without installing any build
dependencies except mkosi on the host machine.

(cherry picked from commit 6d862a9dc0)
2024-10-08 16:39:12 +01:00
Mike Yuan
528cd7dc84 machined: fix bogus error check for machine_link()
(cherry picked from commit 533c20ca5b)
2024-10-08 16:39:12 +01:00
Daan De Meyer
efd5e357d7 Add an extra debug log to dissect_image()
(cherry picked from commit 0121b84e41)
2024-10-08 16:39:12 +01:00
Zbigniew Jędrzejewski-Szmek
bf64e901e4 mkosi: bump mkosi MinimumVersion
dbff64ddf0 bumped the hash to
a commit after 24.3, so let's tell the users that 25~devel is
the minimum required.

(cherry picked from commit 3a157e7cb4)
2024-10-08 16:39:12 +01:00
Yu Watanabe
06eb9b1482 sd-ipv4acd: fix assertion triggered when an ARP received in STARTED state
When a network is busy, an ARP may be received before the timer event
source triggered first time.

Fixes #34489.

(cherry picked from commit 146b44d0a0)
2024-10-08 16:39:12 +01:00
Mike Yuan
d7ae71b9c1 boot: use INC_SAFE where appropriate
(cherry picked from commit 48837c6500)
2024-10-08 16:39:12 +01:00
Mike Yuan
7884db1b93 tmpfiles: ERRNO_IS_NOINFO -> _IS_NEG_, correct negative errno checks
(cherry picked from commit 755877f20a)
2024-10-08 16:39:12 +01:00
cvlc12
f535bbea13 man: update PCR and Secure Boot key names and paths
(cherry picked from commit dbf5b09de4)
2024-10-08 16:39:12 +01:00
Yu Watanabe
308c93c51f test: add tests for seccomp_suppress_sync()
(cherry picked from commit c07e10628b)
2024-10-08 16:39:12 +01:00
Yu Watanabe
4bbd6f589a seccomp-util: pass negative fds as is to fsync() and friends
Closes #34478.

Co-authored-by: Mike Yuan <me@yhndnzj.com>
(cherry picked from commit 144fbbac23)
2024-10-08 16:39:12 +01:00
Daan De Meyer
3f313d0d49 test: Run TEST-74-AUX-UTILS in virtual machine
Various tests skip themselves when running in a container so make
sure the test runs in a virtual machine so we get full coverage.

(cherry picked from commit f4faac2073)
2024-10-08 16:39:12 +01:00
Yu Watanabe
84d5d3af9d man: fix typo
Follow-up for 8aee931e7a.

(cherry picked from commit 07e6a111c0)
2024-10-08 16:39:12 +01:00
Daan De Meyer
e365f6edf8 ci: Don't add testuser to wheel and systemd-journal groups
This breaks TEST-74-AUX-UTILS when run in a VM as the user gets access
to journal files that the test expects it can't access.

(cherry picked from commit 1d5b4317cd)
2024-09-25 21:27:25 +02:00
Daan De Meyer
f457acb663 mkosi: Stop applying device groups patch on Arch
It stopped applying so let's stop applying it to make CI green again.

(cherry picked from commit cf94f513f0)
2024-09-25 21:27:25 +02:00
Daan De Meyer
d1f09ff4cd mkosi: Disable makepkg PKGBUILD linting using the newly added environment variable
(cherry picked from commit 27a8a29e32)
2024-09-25 21:27:25 +02:00
Zbigniew Jędrzejewski-Szmek
c1fd422f2c mkosi: supress error messages from git
When updating, I get a message like:
fatal: Not a valid object name a67221c3f0d0b81b9b5b3230a71d09044342f1a4^{commit}

The failure here is expected, it just means that an update is
necessary, so suppress output.

(cherry picked from commit 3f922abe49)
2024-09-25 21:27:25 +02:00
Daan De Meyer
d64193a2a6 boot: Make initrd_prepare() semantically equivalent to combine_initrds()
Currently, trying to boot images with type 1 entries generated by mkosi
with qemu freezes in the kernel EFI stub. I'm not going to pretend I
understand what's going on, but when I reported a similar problem with
UKIs, the fix was to rework the code in combine_initrds() in the stub
to behave like it does today. It seems that same fix was never applied
to systemd-boot's combine_initrds() function, so let's do that now to
fix the freezes I've been seeing trying to boot images with type 1 entries
in qemu.

(cherry picked from commit f8fa4222c9)
2024-09-15 20:16:51 +02:00
Luca Boccassi
2552348da2 portable: ensure PORTABLE_FORCE_ATTACH works even when there is a leftover unit
Force means force, we skip checks with PID1 for existing units, but
then bail out with EEXIST if the files are actually there. Overwrite
everything instead.

(cherry picked from commit 1e2d1a7202)
2024-09-11 13:19:25 +02:00
Luca Boccassi
a2c84836ef test: mount ld.so.cache in minimal nspawn container if present
In some cases (SUSE Tumbleweed) this is needed as a library (libz) is
not in the default path, so it fails to run.

(cherry picked from commit 1e17e48b96)
2024-09-11 13:19:25 +02:00
Luca Boccassi
230f5613c9 meson: bump version to 256.6 2024-09-10 17:02:09 +02:00
Luca Boccassi
f13e3a93d7 hwdb: update to main@{2024-09-10}
git restore -s origin/main hwdb.d/ test/hwdb.d
2024-09-10 17:01:26 +02:00
Daan De Meyer
f64ee10e4e mkosi: Add back accidentally removed .gdbinit file
(cherry picked from commit b811b9addf)
2024-09-10 14:56:05 +02:00
Luca Boccassi
dd577dde5e mkosi: use util-linux's autologin
login is now from util-linux so credentials are supported.
It also needs to be pulled in as it's Protected: yes rather than
Essential: yes.

Keep the old setting for Ubuntu as that still uses login from shadow.

(cherry picked from commit ec54029017)
2024-09-10 14:56:05 +02:00
Daan De Meyer
37e130e203 mkosi: Don't create sanitizer wrappers for every mkfs binary
mksquashfs for some reason ends up in nss_systemd and mkfs.btrfs
links against libudev. The others don't need a sanitizer wrapper
script.

(cherry picked from commit 67b240f6b0)
2024-09-10 14:56:05 +02:00
dependabot[bot]
4fe2c97477 build(deps): bump systemd/mkosi
Bumps [systemd/mkosi](https://github.com/systemd/mkosi) from 8c2f828701a1bdb3dc9b80d6f2ab979f0430a6b8 to 31b4e756c1484c302435653da5d3b9bdfae38518.
- [Release notes](https://github.com/systemd/mkosi/releases)
- [Changelog](https://github.com/systemd/mkosi/blob/main/NEWS.md)
- [Commits](8c2f828701...31b4e756c1)

---
updated-dependencies:
- dependency-name: systemd/mkosi
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 0333969a40)
2024-09-10 14:56:05 +02:00
Daan De Meyer
5d48558f4b mkosi: Use apt patterns to install dependencies on Debian/Ubuntu
Instead of parsing the human readable output of apt-cache, let's
use apt patterns to figure out the dependencies.

We also filter out virtual packages as apt will fail and say we need
to install an implementation of the virtual package even if a package
that provides the virtual package is already installed.

(cherry picked from commit 89c579788d)
2024-09-10 14:56:05 +02:00
Daan De Meyer
e6feb4fa90 mkosi: Make systemd package filtering more robust
Let's not just filter everything with systemd in the name, but instead
use the same list of volatile packages that we install to do the
filtering.

(cherry picked from commit 70ecdbfa23)
2024-09-10 14:56:05 +02:00