1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-05 09:17:44 +03:00
Commit Graph

55856 Commits

Author SHA1 Message Date
Zbigniew Jędrzejewski-Szmek
9e62e7facb on-ac-power: rework logic
History of the function:
96788d2aa4 assume system is running on AC power when no battery found
795e86b4f1 ignore USB-C ports in power source mode when detecting system is running on AC power
c19a51bec4 invert ac_power() source type check
6d89003462 assume ac when /sys/class/power_supply is missing
240dbaa44f add ConditionACPower=

Interestingly, the return condition 'on_ac_power == found_online || !found_offline'
was there from the very beginning, and even Yu's latest change doesn't change this,
but only extends it to 'on_ac_power == found_online || !found_offline || !found_battery'.
This means that any system with no AC power supply will be unconditionally classified
as on_ac_power.

Let's change the logic: if we have an online AC supply, answer is "yes". If no
supplies, but we have a battery, answer is "no". Otherwise, assume "yes", based
on the assumption that presense of a battery would at least be always reported,
even if an AC power supply might not be.

Fixes #24407. It also shouldn't impact previous fixes: assume ac when
/sys/class/power_supply is missing, ignore USB-C ports in power source mode,
assume system is running on AC power when no battery found.

(cherry picked from commit 4a52514b37)
(cherry picked from commit 9886011356)
2022-11-04 13:02:21 +01:00
Zbigniew Jędrzejewski-Szmek
3ce09d9127 shared/udev-util: say "ignoring device", not "ignoring"
The short form sounds like we're ignoring the error.

(cherry picked from commit 406fbeca32)
(cherry picked from commit 6d4c138534)
2022-11-04 13:02:20 +01:00
Zhaofeng Li
86e121dd7b virt: Support detection of Apple Virtualization.framework guests
(cherry picked from commit f555830674)
(cherry picked from commit cd2fad2300)
2022-11-04 13:02:20 +01:00
Yu Watanabe
85ec3345fc virt: align tables
(cherry picked from commit 5c86cec1f3)
(cherry picked from commit 6e47e75c86)
2022-11-04 13:02:20 +01:00
David Jaša
7cb0c3bc99 check-os-release.py compatible with Python < 3.8
The ":=" operator was only added in Python 3.8 so splitting the line with it into two makes check-os-release.py actually fulfill its claim of working with any python version.

(cherry picked from commit ce0a056abc)
(cherry picked from commit 951e99231e)
2022-11-04 13:02:20 +01:00
Yu Watanabe
d59171e362 core/mount: adjust deserialized state based on /proc/self/mountinfo
Fixes #23796.
Replaces #23803 and #23851.

(cherry picked from commit 01400460ae)
(cherry picked from commit d572a74163)
2022-11-04 13:02:20 +01:00
Goffredo Baroncelli
eb53ee4a2f Allow uneven length BootXXXX variables
The BootXXXX variables may have an uneven length. Don't return error
in this case.

Signed-off-by: Goffredo Baroncelli <kreijack@inwind.it>
(cherry picked from commit 046f101bf6)
(cherry picked from commit 2e372afc35)
2022-11-04 13:02:20 +01:00
Yu Watanabe
5fe4b668cd gpt: fix native uuids for s390x
__s390__ is defined for both s390 and s390x. Hence, we need to define
the native uuids for s390x at first.

(cherry picked from commit 4565246911)
(cherry picked from commit 8ad143e684)
2022-11-04 13:02:20 +01:00
Antonio Alvarez Feijoo
683980d551 bash-completion: add systemd-sysext support
(cherry picked from commit aa2118cb0b)
(cherry picked from commit cf67d5ed1b)
2022-11-04 13:02:20 +01:00
Antonio Alvarez Feijoo
bff3edb1ca sysext: add missing COMMAND to the help output and man synopsis
(cherry picked from commit 782e41ab88)
(cherry picked from commit ada437cfb1)
2022-11-04 13:02:20 +01:00
Zbigniew Jędrzejewski-Szmek
503ebc858f booctl: do not say uuids differ if one of the uuids is unset
We allow ESP autodetection to fail, e.g. if it is not mounted, but then we'd
say that the detected one is different than the one reported by the bootloader,
which is rather confusing.

While at it, if we actually detect a mismatch, print the two uuids.

(cherry picked from commit 22e54dd6de)
(cherry picked from commit 4ffde70981)
2022-11-04 13:02:20 +01:00
Luca Boccassi
ef7b17be53 bash-completion: autocomplete cgroup names in systemd-cgtop
(cherry picked from commit 0a152619ac)
(cherry picked from commit 5219a99ccb)
2022-11-04 13:02:20 +01:00
Avram Lubkin
7ca021b87e sysusers: add fsync for passwd (#24324)
https://github.com/systemd/systemd/pull/6636 added `fsync()` when
temporary shadow, group, and gshadow files are created, but it was
not added for passwd. As far as I can tell, this seems to have been
an oversight. I'm seeing real world issues where a blank /etc/passwd
file is being created if a machine loses power early in the boot process.

(cherry picked from commit 19193b4898)
(cherry picked from commit 9f2f391153)
2022-11-04 13:02:20 +01:00
Yu Watanabe
c3fcff5291 udev/cdrom_id: check last track info
Fixes off-by-one issue.

Fixes #24306.

(cherry picked from commit 628998ecfa)
(cherry picked from commit c67a388aef)
2022-11-04 13:02:20 +01:00
bin456789
da1589db45 firstboot: fix can't overwrite timezone
(cherry picked from commit e56dc320d3)
(cherry picked from commit 52c631b02e)
2022-11-04 13:02:20 +01:00
Lennart Poettering
462b20cbd6 cryptenroll: fix memory leak
(cherry picked from commit 7e196e9aac)
(cherry picked from commit f279a6f4d1)
2022-11-04 13:02:20 +01:00
Yu Watanabe
b48a17f13f sd-device-monitor: actually refuse to send invalid devices
Fixes an issue introduced by 9e79123884.

(cherry picked from commit 8bb4989906)
(cherry picked from commit 6e1acfe818)
2022-11-04 13:02:20 +01:00
Yu Watanabe
02a5c22ec1 sd-device-monitor: fix inversed condition
Fixes an issue introduced by b3d06b9226.

(cherry picked from commit 133d78966f)
(cherry picked from commit 81339c45e8)
2022-11-04 13:02:20 +01:00
exploide
45e46fb4b2 resolvctl: only remove protocol after last dot when mangling ifname for resolvconf
ifname_resolvconf_mangle is supposed to remove protocol suffixes like .dhcp
from interface names. But this removed also valid parts of the ifname like
VLAN IDs, e.g. enp2s0u4.72.dhcp -> enp2s0u4 instead of enp2s0u4.72

After this change, everything behind the last dot is removed instead of the first.

(cherry picked from commit e8d0eb3915)
(cherry picked from commit 1760559918)
2022-11-04 13:02:20 +01:00
Yu Watanabe
2aeff0f39a oom: drop invalid %m in the log message
Fixes https://github.com/systemd/systemd/issues/23785#issuecomment-1210030100.

(cherry picked from commit b6f6df4cb0)
(cherry picked from commit a3348ba748)
2022-11-04 13:02:20 +01:00
Jan Janssen
658013a7f7 meson: Test correct efi linker for supported args
Fixes: #24241
(cherry picked from commit 6a941db798)
Closes https://github.com/systemd/systemd-stable/issues/216
(cherry picked from commit b3dd66f32b)
2022-11-04 13:02:20 +01:00
Luca BRUNO
3733943f5a sysusers: properly process user entries with an explicit GID
This tweaks user creation logic to properly take into consideration
an explicitly requested GID.
It fixes a bug where the creation flow would mistakenly fall back
to use the username instead, resulting in wrong lookups in case of
users and groups using the same name.

(cherry picked from commit 5ed47c4d23)
(cherry picked from commit f9d936b865)
2022-11-04 13:02:20 +01:00
Luca BRUNO
6ab318435e sysusers: only check whether the requested GID is available
This relaxes the availability check when creating a group, if an
explicit GID has been requested.
It avoids mixing up users and groups entries with valid and unique
UIDs/GIDs, but each having the same ID number.

(cherry picked from commit 6b6e45eb73)
(cherry picked from commit ec5a46ca34)
2022-11-04 13:02:20 +01:00
Yu Watanabe
887837a5a9 dhcp: fix potential buffer overflow
Fixes a bug introduced by 324f818781.

This also renames several macros for DHCP packet size.

(cherry picked from commit 4473cd7f61)
(cherry picked from commit 037b1a8acc)
2022-11-04 13:02:20 +01:00
Yu Watanabe
647c44c21a udev-util: assume system is running on AC power when no battery found
Fixes #24214.

(cherry picked from commit 96788d2aa4)
(cherry picked from commit ed2955f8fe)
2022-11-04 13:02:20 +01:00
undef
d1166a9060 shared/generator: Ensure growfs unit runs after repart
When deploying an image using systemd-repart and systemd-growfs one
should have the image expanded entirely and ready to use after the first
boot. This ensures that growfs does not occur before repart, thus
requiring a second boot.

(cherry picked from commit 7b45d6b6f6)
(cherry picked from commit 4fdca1ab9e)
2022-11-04 13:02:20 +01:00
Yu Watanabe
89a5b7752f network: dhcp4: disable DHCPv4 client on interfaces with non-supported types
Replaces f42d41cc5f.

(cherry picked from commit 7e2f684e1f)
(cherry picked from commit 9951ea07d5)
2022-11-04 13:02:20 +01:00
Jan Janssen
b9216947a3 boot: Build with at least -O1 as workaround
Fixes: #24202
(cherry picked from commit 2fb1165238)
(cherry picked from commit b0da0d6102)
2022-11-04 13:02:20 +01:00
Ludwig Nussel
8625211cc8 pull: fix PullFlags numbering
(cherry picked from commit 5243331fb8)
(cherry picked from commit 6a9cf204a7)
2022-11-04 13:02:20 +01:00
Luca Boccassi
c454d5fafb integritysetup: do not use crypt_init_data_device after crypt_init
crypt_init_data_device() replaces the crypt_device struct with a
new allocation, losing the old one, which we get from crypt_init().
Use crypt_set_data_device() instead.

Enhance the test to cover this option too.

(cherry picked from commit 872f9da4d8)
(cherry picked from commit a27b694453)
2022-11-04 13:02:20 +01:00
Daan De Meyer
215b6ce2d6 man: Clarify that tools should prefer mount units over editing fstab
(cherry picked from commit 29e804dffd)
(cherry picked from commit 3814bd0e71)
2022-11-04 13:02:20 +01:00
Lennart Poettering
3367e1bf48 man: fix docbook
(cherry picked from commit 1374f5a03a)
(cherry picked from commit 6b58b06c7d)
2022-11-04 13:02:20 +01:00
James Hilliard
4fa81b6a2d bpf: fix is_allow_list section
The llvm bpf compiler appears to place const volatile variables in
a non-standard section which creates an incompatibility with the gcc
bpf compiler.

To fix this force GCC to also use the rodata section.

Note this does emit an assembler warning:
Generating src/core/bpf/restrict_ifaces/restrict-ifaces.bpf.unstripped.o with a custom command
/tmp/ccM2b7jP.s: Assembler messages:
/tmp/ccM2b7jP.s:87: Warning: setting incorrect section attributes for .rodata

See:
https://github.com/llvm/llvm-project/issues/56468

Fixes:
../src/core/restrict-ifaces.c:45:14: error: ‘struct
restrict_ifaces_bpf’ has no member named ‘rodata’; did you mean
‘data’?
   45 |         obj->rodata->is_allow_list = is_allow_list;
      |              ^~~~~~
      |              data

(cherry picked from commit e8b1e9cf10)
(cherry picked from commit cdd3f180b0)
2022-11-04 13:02:20 +01:00
Loïc Collignon
12b041584a Fix 24172: __STDC_VERSION__ may be defined in C++
According to the C++ ISO standard, a conformant compiler is allowed to
define this macro to any value for any reason as it is implementation
defined: https://timsong-cpp.github.io/cppwp/cpp.predefined#2.3

This mean that it cannot be assumed that it is not defined in a C++.
Change the condition to reflect that.

(cherry picked from commit 00852912ed)
(cherry picked from commit 45faf77d4d)
2022-11-04 13:02:20 +01:00
Lennart Poettering
618b8d5a6d systemctl: clarify that "status" is about the most recent invocation of a service
And point people to "journalctl --unit=" for information of prior runs.

Inspired by: #24159

(cherry picked from commit 157cb4337b)
(cherry picked from commit 0cfe2d7e88)
2022-11-04 13:02:20 +01:00
Lennart Poettering
8e6ba03724 repart: when keeping ref to backing inode/devnode, use fd_reopen() rathern than F_DUPFD
Via the "backing_fd" variable we intend to pin the backing inode through
our entire code. So far we typically created the fd via F_DUPFD_CLOEXEC,
and thus any BSD lock taken one the original fd is shared with our
backing_fd reference. And if the origina fd is closed but our backing_fd
is not, we'll keep the BSD lock open, even if we then reopen the block
device through the backing_fd. If hit, this results in a deadlock.

Let's fix that by creating the backing_fd via fd_reopen(), so that the
locks are no longer shared, and if the original fd is closed all BSD
locks on it that are in effect are auto-released.

(Note the deadlock is only triggered if multiple operations on the same
backing inode are executed, i.e. factory reset, resize and applying of
partitions.)

Replaces: #24181
(cherry picked from commit 38f81e9374)
(cherry picked from commit d3e84e4703)
2022-11-04 13:02:20 +01:00
Jacek Migacz
a2fc30409d resolved: fix single-label resolution over DNS
Fixes: #23494 (when ResolveUnicastSingleLabel=yes)
(cherry picked from commit ff0a5070d4)
(cherry picked from commit 7384d152c8)
2022-11-04 13:02:20 +01:00
Cristian Rodríguez
c57e95e8fa gcrypt: switch to system rng before gcry_check_version (#24162)
Current docs claim this must be done before gcry_check_version.

(cherry picked from commit 91375fb9cf)
(cherry picked from commit 695eb67322)
2022-11-04 13:02:20 +01:00
Max Gautier
427d189479 docs: Correct StandartOutput documentation
fix #2114

(cherry picked from commit e0a12b9634)
(cherry picked from commit 79de67e2df)
2022-11-04 13:02:20 +01:00
Eli Schwartz
9359dd6977 meson: fix broken boolean kwarg
Everywhere else that `conf.get('ENABLE_*')` is used as a boolean key for
something (for example in if statements) it always checks if == 1, but
in this one case it neglects to do so. This is important because
conf.get yields the same int that was stored, but if statements require
booleans.

So does executable's "install" kwarg, at least according to the
documentation. In actuality, it accepts all types without sanity
checking, then uses python "if bool(var)", so you can actually do
`install: 'do not'` and that's treated identical to `true`. This is a
type-checking bug which Meson will eventually fix.

muon fails on the same code, today.

(cherry picked from commit 9e4a50bcdf)
(cherry picked from commit 3a382bf86b)
2022-11-04 13:02:20 +01:00
Cristian Rodríguez
97c82a3abb gcrypt: prefer the OS RNG
by default, gcrypt defaults to an userspace RNG, this is
the wrong thing (tm) to do on linux.

Switch to the SYSTEM rng instead.

(cherry picked from commit 80f967311a)
(cherry picked from commit ca0ed3a78c)
2022-11-04 13:02:20 +01:00
Fei Li
427995b49b virt: detect KubeVirt instance
Kubevirt is currently technically based on KVM (but not xen yet[1]).
The systemd-detect-virt command, used to differentiate the current
virtualization environment, works fine on x86 relying on CPUID, while
fails to get the correct value (none instead of kvm) on aarch64.

Let's fix this by adding a new 'vendor[KubeVirt] = kvm' classification
considering the sys_vendor is always KubeVirt.

[1] https://groups.google.com/g/kubevirt-dev/c/C6cUgzTOsVg

Signed-off-by: Fei Li <lifei.shirley@bytedance.com>
(cherry picked from commit c15d1ac2c4)
(cherry picked from commit e7d635f0b9)
2022-11-04 13:02:20 +01:00
w30023233
62ea1502e0 virt: detect OpenStack Nova instance
(cherry picked from commit 01d9fbccdd)
2022-11-04 13:02:19 +01:00
Vishal Chillara Srinivas
fb48f600cf RFC 6762 section 7.1: a Multicast DNS querier SHOULD NOT include records in the
Known-Answer list whose remaining TTL is less than half of their original TTL

(cherry picked from commit f941c12427)
(cherry picked from commit ef6c379089)
2022-11-04 13:02:19 +01:00
Yu Watanabe
d935dd7e9d resolve: do not trigger assertions on invalid query
(cherry picked from commit 055acd4d8b)
(cherry picked from commit b61a61ec53)
2022-11-04 13:02:19 +01:00
Yu Watanabe
30d24c8df6 resolve: mdns_packet_extract_matching_rrs() may return 0
Fixes the following assertion:
---
Assertion 'r > 0' failed at src/resolve/resolved-mdns.c:180, function mdns_do_tiebreak(). Aborting.
---

(cherry picked from commit f2605af1f2)
(cherry picked from commit 0070302b3c)
2022-11-04 13:02:19 +01:00
Yu Watanabe
23d0a99497 resolve: fix misuse of accuracy parameter in sd_event_add_time()
Also, this makes mDNS regular queries sent without delay (except for
one caused by the default accuracy of sd-event).

Note, RFC 6762 Section 5.2 is about continuous mDNS query, which is not
implemented yet.

(cherry picked from commit 765647ba80)
(cherry picked from commit 41810cb166)
2022-11-04 13:02:19 +01:00
Yu Watanabe
324bacfe9a resolve: drop unnecessary else, and add short comment
(cherry picked from commit 4b2ceb8a48)
(cherry picked from commit a1edebfde0)
2022-11-04 13:02:19 +01:00
Yu Watanabe
dc3faeed05 resolve: mdns: fix use-after-free
Fixes #23843 and #23873.

(cherry picked from commit d50a58e725)
(cherry picked from commit e832a277ea)
2022-11-04 13:02:19 +01:00
Luca Boccassi
74c33f69bb portable: set PrivateTmp=yes in trusted profile too
When running on images you don't want to modify the /tmp
directory even if it's writable, and often it will just
be read-only. Set PrivateTmp=yes.

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

(cherry picked from commit f2d26cd89b)
(cherry picked from commit 6e111d2811)
2022-11-04 13:02:19 +01:00