1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-01 05:47:04 +03:00

63316 Commits

Author SHA1 Message Date
Yu Watanabe
406b3a07cd core: allow to run generators without sandboxing on qemu-user
When running on non-native userland architecture via systemd-nspawn
and qemu-user-static QEMU-emulator, clone() with CLONE_NEWNS fails with
EINVAL.

Fixes #28901.

[zjs: add a comment in the code]

(cherry picked from commit 468018703ce1c0f123240fb6ba9b8b0b90f12930)
(cherry picked from commit 0e25a211d40d62caeb90cae92c138e9331554513)
2023-09-08 00:45:00 +01:00
Daan De Meyer
edf4a86f3d fd-util: Use /proc/pid/fd instead of /proc/self/fd
Currently, we mount via file descriptors using /proc/self/fd. This
works, but it means that in /proc/mounts and various other files,
the source of the mount will be listed as /proc/self/fd/xxx. For other
software that parses these files, /proc/self/fd/xxx doesn't mean anything,
or worse, it means the completely wrong thing, as it will refer to one of
their own file descriptors instead.

Let's improve the situation by using /proc/pid/fd instead. This allows
processes parsing /proc/mounts to do the right thing more often than not.
One scenario where even this doesn't work if when containers are involved,
as with the pid namespace unshared, even /proc/pid/fd will mean the wrong
thing, but it's no worse than /proc/self/fd which will always means the wrong
thing.

This also doesn't work if we mount via file descriptor and then exit, as the pid will
be gone, but it does work as long as the process that did the mount is alive, which
makes it useful for systemd-dissect --with for example if the program we run in the
image wants to parse /proc/mounts.

(cherry picked from commit 4419735822d72744dad1c76a57463561b332897a)
(cherry picked from commit 8046167dc2d6d7ad62a447991efcd0404d784180)
2023-09-08 00:45:00 +01:00
Daan De Meyer
299e6cd33b tree-wide: Always include <net/if.h> before related linux headers
Otherwise, we get redefinition errors if <net/if.h> is included later
on by another header.

(cherry picked from commit 2af02e61657aa513aa7b6df7fd1a04b13f853cef)
(cherry picked from commit 49a3ecd71d700dc2d914bfee70dd93275b698ae7)
2023-09-08 00:45:00 +01:00
Daan De Meyer
3621e136ad debug-generator: Use generator_add_symlink()
(cherry picked from commit bd6c95c00b7a25b4d360bac22d3a3bc54132c415)
(cherry picked from commit 0d1198a79c721dd35a66588ad72d446ce4fa15f0)
2023-09-08 00:45:00 +01:00
Luca Boccassi
f3406de821 dissect: add 'f2fs' to allow-listed filesystems
f2fs is actively maintained upstream, and popular in certain device
categories (phones, embedded), so allow-list by default.

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

(cherry picked from commit ee6cf8eaf1770d9a32e6f80bb9d37b64c838e230)
(cherry picked from commit f38b883b030031a79205f0d559906e18567706df)
2023-09-08 00:45:00 +01:00
Lennart Poettering
98584e89ad logind: give better error messages when failing to attach devices to seats
When the user tries to attach a device lacking ID_FOR_SEAT they
currently get a very cryptic error message. Let's improve the situation
a bit. Still a bit cryptic maybe, but much less so.

Inspired-by: https://lists.freedesktop.org/archives/systemd-devel/2023-September/049469.html
Inspired-by: https://lists.freedesktop.org/archives/systemd-devel/2023-September/049484.html
Also-see: https://lists.freedesktop.org/archives/systemd-devel/2023-September/049470.html
Also-see: https://lists.freedesktop.org/archives/systemd-devel/2023-September/049489.html
(cherry picked from commit 08237f062e9a2020c6d457a4112e363ee9ff879d)
(cherry picked from commit 3126a5a5aa7b9b242c247e1595b60ac244ee2241)
2023-09-08 00:45:00 +01:00
Yu Watanabe
262ba9bba6 icmp6-util: make icmp6_receive() accept the null source address
Fixes #29050.

(cherry picked from commit 4961f5664647ee32fe9f2c8981cdd7852e511a09)
(cherry picked from commit fabdb2832da1fc380c76473161119531c97843e5)
2023-09-08 00:45:00 +01:00
Yu Watanabe
bd96e3ace7 icmp6-util: several cleanups for icmp6_receive()
- Rename the argument for storing the sender address,
- allow to call it with NULL for ret_xyz,
- reduce needless copy of timestamp when the message does not have
  timestamp.

(cherry picked from commit 512116383215c2f61172dd20e45871ff5d16c030)
(cherry picked from commit 811edcef2d7593b45bc8e683e50a580763ebf447)
2023-09-08 00:45:00 +01:00
Yu Watanabe
9f545c1aea sd-ndisc,sd-radv: fix use of uninitialized value
When icmp6_receive() fails, then the source address is not initialized yet.

(cherry picked from commit 4674f407b2a96baaed4c8226342bccb313463717)
(cherry picked from commit 9dec95c8c50dc0057454363affe02b9114d14055)
2023-09-08 00:45:00 +01:00
Frantisek Sumsal
98cae25cbb shell-completions: add missing systemctl verbs/options
Resolves: #29048
(cherry picked from commit 97e2785292d6c9ff35887126876f631f6d23b23c)
(cherry picked from commit ae5445a059aca81f4f39eecd2268390e0f9937f9)
2023-09-08 00:45:00 +01:00
Frantisek Sumsal
2cf4bbd373 shell-completions: code cleanup
(cherry picked from commit 05ebcbd5c54ffaa59ce6855b8cb9907ee4e43a86)
(cherry picked from commit 307a5e8ef41ccf67c324213bdc768673edc59fd8)
2023-09-08 00:45:00 +01:00
Christian Hergert
6a163f1557 oomd: avoid unnecessary wake-ups for ManagedOOMSwap
If there are no "ManagedOOMSwap" entries to monitor, then the event source
can be completely disabled. This scenario appears to be common and avoiding
the wake-ups can save idle energy consumption.

This was discovered while using Sysprof for various GNOME 45 performance
tuning. systemd-oomd goes from waking up a few times a second to no
wake-ups helping keep a laptop in deep(er) sleep.

Signed-off-by: Christian Hergert <chergert@redhat.com>
(cherry picked from commit b63beb4d283438be2b0f5c62757ab0db7dee8d65)
(cherry picked from commit 08d0b94e363cba14c8176bc2279070dcea020fd4)
2023-09-08 00:45:00 +01:00
msizanoen
b10bc73918 sd-login: Fix sd_pidfd_* function signature parameter types
The type of a file descriptor is `int`, not `pid_t`. This should not
have any effects on API consumers as `pid_t` is already typedef'd as
`int` on all glibc-based systems.

(cherry picked from commit 904b8bb5a8da4aa0257f7730e4fbaa7ba7c67742)
(cherry picked from commit 6f83ab7d70f0e6f2023bc07f0a0a02ea2e8257b5)
2023-09-08 00:45:00 +01:00
msizanoen
c70dc59688 login: Properly handle -EIO in session_leave_vt
session_leave_vt may be called after the VT device was hung up, which
will cause vt_release to fail with -EIO. This is known to cause an issue
with GNOME 44 on Fedora where gdm-session-worker sometimes freezes when
trying to switch to VT 1 after a `loginctl terminate-user` operation.

Fix this by reopening the VT in session_leave_vt if we get an -EIO.

(cherry picked from commit 99d4ad71b72045d6352ba221105843fc6b600717)
(cherry picked from commit 1bfe066deb43792f6e5d33ce6d2e92b7a42c4e23)
2023-09-08 00:45:00 +01:00
Chris Patterson
e94ddb830b 99-systemd.rules.in: tag PTP devices with systemd
Chronyd and similar time services, when using PTP devices, may need
the BindsTo/After directives to ensure the devices are available
before starting.  Tag PTP devices with systemd to allow for wider
adoption.

Signed-off-by: Chris Patterson <cpatterson@microsoft.com>
(cherry picked from commit 23cbe90d7db6b569ae2fc18ad88f99f8ef505593)
(cherry picked from commit e3a69bdbc03c90864cc39116e45e149fa37de2f4)
2023-09-08 00:45:00 +01:00
Michael Vasseur
1ab8d21988 pkg.m4 macro needs brackets
See documentation at: https://manpages.debian.org/testing/pkgconf/pkg.m4.7.en.html

Without this the macro was not always correctly resolved so the correct command was not used in the rest of the snippet.

(cherry picked from commit c91d636fadc07169641e8a96a2c60083a15e0f77)
(cherry picked from commit 01841ae82935bdd4f8b01af800f5c53c0fb2adbe)
2023-09-08 00:45:00 +01:00
Zbigniew Jędrzejewski-Szmek
41a3e30b12 man/gpt-auto-generator: avoid saying "negative" for boolean
Fixes #28928.

(cherry picked from commit 7abb0eef8fe4510e04c365778489af01ad562587)
(cherry picked from commit 9d43d9e8c54933ffda8b9b31948c597ff8fee9de)
2023-09-08 00:45:00 +01:00
Daan De Meyer
30ce78cb1a Limit rlim_max in rlimit_nofile_safe() to nr_open
We might inherit a max rlim value that's larger than the kernel's
maximum (nr_open). This will cause setrlimit() to fail as the given
maximum is larger than the kernel's maximum. To get around this,
let's limit the max rlim we pass to rlimit() to the value of nr_open.

Should fix #28965

(cherry picked from commit f470dafddcd688c3ea6031d4bbcbf934fd094711)
(cherry picked from commit a980b83fe07521e4654d68331c31db3a4459412c)
2023-09-08 00:45:00 +01:00
Lennart Poettering
b94677ee3d boot: explain why we refuse to edit kernel cmdline when we do so
(cherry picked from commit c4d281fa1a6a99208daef2b80f57bcad37a6eaab)
(cherry picked from commit 5f09b13339d522e629dbb1d8fd29264cd939c278)
2023-09-08 00:45:00 +01:00
Lennart Poettering
4e51e336c8 man: mention two more things logind does
Prompted by: #28902

(cherry picked from commit 1126841553a28f22eb6bc55eeed8af8d98610f71)
(cherry picked from commit bec4bb92e24fd284974a2d9e4e67563da2732cbb)
2023-09-08 00:45:00 +01:00
Daan De Meyer
d651df3ab8 install: Drop install_info_may_process() from unit_file_get_default()
This currently makes unit_file_get_default() fail if the default
target is transient which shouldn't make us fail to get the default
unit.

(cherry picked from commit 3c1c52f2c9e67fe60b36325be7292ff0baaf808b)
(cherry picked from commit a6bd20e3de03109c81134838f9da587570af3cae)
2023-09-08 00:45:00 +01:00
Daan De Meyer
d8cd17d109 parse-helpers: Add PATH_KEEP_TRAILING_SLASH
(cherry picked from commit ce60b3a40a89bb5d116003343c56c55a0da9f8fb)
(cherry picked from commit 979b2abbdde5ba5e985eca343e67ebadd2a7c220)
2023-09-08 00:45:00 +01:00
Daan De Meyer
c1b5f5b081 path-util: Add path_simplify_full()
Sometimes its useful to keep a trailing slash in the path so let's
add path_simplify_full() and a flag to do just that.

(cherry picked from commit 4541d045b2cc2834add853f06293d4474ac403e4)
(cherry picked from commit ff45789ea3323d2c2526ed76d06a0f7625d778df)
2023-09-08 00:45:00 +01:00
Yu Watanabe
6d25022e36 core/mount: disable timer event source when USEC_INFINITY
Setting USEC_INFINITY to timer event source should not cause any
problem. But, disabling timer event source should be preferable.

[zjs: simplify the call to sd_event_source_set_enabled()]

(cherry picked from commit 57d2b6a96f997c23bed37d74c6da087fb06081d2)
(cherry picked from commit 6b1346f1f01fbe384a7c828db4d7dee4921e483c)
2023-09-08 00:45:00 +01:00
Daan De Meyer
6691b54958 hostname: Make sure we pass error to bus_verify_polkit_async()
Fixes #28943

(cherry picked from commit b56ee692334231f0312c2fd142b9f2a84da14ac9)
(cherry picked from commit d38ba62059c7d28dbd259699df224ec19a10f4aa)
2023-09-08 00:45:00 +01:00
Zbigniew Jędrzejewski-Szmek
33d1a10c6d manager: fix error handling after failure to set up child
exec_child() is supposed to set *exit_status when returning failure.
Unfortunately, we didn't do that in two cases. The result would be:
- a bogus error message "Failed at step SUCCESS spawning foo: …",
- a bogus success exit status.

Bugs introduced in 390902012c5177b6b01bc634b2e9c704073d9e7d and
ad21e542b20f0fb292d1958d3a759bf3403522c2.

The code is reworked to add some asserts and not set exit_status in the caller
so that it's clearer (also to the compiler) that it needs to be set.

(cherry picked from commit 5fa01ac0369f0f225ab1e1f90f6b7058cc4deaaf)
(cherry picked from commit 063d67fe3255128da75d0e8ccd5afeb5c07699ff)
2023-09-08 00:45:00 +01:00
Warren
c03d5f1ddb p11kit: check the flags associated with the slot instead of flags associated with the token
The logic around checking PKCS11 tokens (used by systemd-cryptenroll) contains a bug.
The code is checking the flags field of a pkcs11 token_info structure against a set of flags defined for the pkcs11 slot_info structure. This PR changes the check so that the correct structure's flag field is being checked.
(Reference to the PKCS#11 spec:http://docs.oasis-open.org/pkcs11/pkcs11-base/v2.40/os/pkcs11-base-v2.40-os.html, section CK_SLOT_INFO).

(cherry picked from commit 5007942477ecfb69702f542cb6770ea4b5bc1e57)
(cherry picked from commit 117fa69b71a8e39f663135c88f78a2412d87c4df)
2023-09-08 00:45:00 +01:00
Mike Yuan
1a77552257 sleep: clear EFI HibernateLocation if writing kernel config fails
Follow-up for f1f331a252d22c15f37d03524cce967664358c5c

(cherry picked from commit 031a399d87de5a47d395bb12b70e112c83b02c3f)
(cherry picked from commit f2fad1523986d9385a670a51f0332031dfe2f07e)
2023-09-08 00:45:00 +01:00
Rahil Bhimjiani
ef7eedb8c0 man: kernel-install(8) add uki.conf in FILES & add ukify(1) in SEE ALSO
Signed-off-by: Rahil Bhimjiani <rahil3108@gmail.com>
(cherry picked from commit f5263dd09e428df42c3d3b12f7e8ca95121ef3ee)
(cherry picked from commit 0baa4866d5f4b68d5d432ae88ddd73282bafcb07)
2023-09-08 00:45:00 +01:00
Michael A Cassaniti
b923225dec file-io: Fix copying sparse files
This change makes sure a data copy using copy_bytes() does not exceed the
max_bytes value when using COPY_HOLES and max_bytes stops before the next
data section.

(cherry picked from commit c2dfcbd48e780e49bfc11f1c34077f6c98891e40)
(cherry picked from commit 7bfe3c6215b03973016aa0931b16628253d7b985)
2023-09-08 00:45:00 +01:00
Franck Bui
c0a45a591c test-mountpoint-util: /root might be mounted
On openSUSE with BTRFS, /root has to be mounted as dedicated subvolume to avoid
restoring it when a rollback of the system happens.

(cherry picked from commit 487ae08b85048f86e72e86d6c601d4c558b6cb8a)
(cherry picked from commit 5c3fa0cfeea1907d2d71bb6dfadc94f661ce3e40)
2023-09-08 00:45:00 +01:00
Lennart Poettering
3a25191361 coredump: fix error path
We must go through finish, to undo the destruction of the final elements
of the iovw properly.

(cherry picked from commit 946dc7c635f050129896d1515c08a81504af2421)
(cherry picked from commit 10304c278755823605655b21c8dbb96f2b58b7e6)
2023-09-08 00:45:00 +01:00
Lennart Poettering
495f887e55 coredump: explicitly document that in order to process a coredump we have to write it to disk first
Prompted by: #28740

(cherry picked from commit 85ec1b6efadf3466bd1d265950f3d967a43cb1d0)
(cherry picked from commit a5d9940957bf7a3a90a9fc41b6a4d76cfe85aa59)
2023-09-08 00:45:00 +01:00
Lennart Poettering
bdc79b27ee man: let's tone down the recommendation to use Type=exec a bit
This is a follow-up for #28596.

I think the suggestion to use Type=exec uses too strong wording:
Type=exec has non-trivial drawbacks over Type=simple, and they deserve
to be mentioned.

Hence drop the <emphasis> and turn this around so that Type=exec is
*recommended*, but Type=simple is not expressly discouraged, because
there are plenty reasons to use it.

Add a brief discussion where Type=simple might be preferable.

Also, fix the outright unruth that Type=exec was the "simplest and
fastest", because it certainly is a lot, but not that.

(cherry picked from commit e5e900edcd3b245499379201072cbb69346e9798)
(cherry picked from commit 045ff3b47a2f6611e079cfdaf330366239b38c98)
2023-09-08 00:45:00 +01:00
Daan De Meyer
8a5b93fbe6 tree-wide: Fix -Wmaybe-uninitialized compilation warnings
(cherry picked from commit 7e48f3ba71614604e2b7fbb5bcfdb1c848600e89)
(cherry picked from commit 550cd149c1ffd7e8b7ce85d30fbcdb8a8b5ce394)
2023-09-08 00:45:00 +01:00
Maxim Mikityanskiy
883aab2e80 hwdb: Mute SW rfkill keys on MSI Wind U100
Kernel patch [1] fixed bugs in rfkill handling on MSI Wind U100. Now
that the HW rfkill reports the correct state, and the SW rfkill is
controllable from userspace, it's necessary to mute KEY_WLAN and
KEY_BLUETOOTH generated on HW rfkill state changes. Otherwise, the
userspace will react to these keys and toggle the SW rfkill as well,
which is not desired, because the user may end up with non-functional
radios if HW and SW rfkills are out of sync.

Blocking these keycodes doesn't impair user experience, because the
desktop environment can still react to HW rfkill events and act
accordingly (for example, show notifications).

While at it, use "unknown" instead of "reserved" to mute keys, to avoid
the "atkbd serio0: Unknown key pressed" flood in dmesg.

[1]: https://lore.kernel.org/all/20230721145423.161057-1-maxtram95@gmail.com/

(cherry picked from commit fa8216e20605ff42054ee316201a13ac6cdd4cd1)
(cherry picked from commit 208a21833b6953a2517a6c3f8f4849c6664b01be)
v253.8
2023-08-09 23:04:43 +01:00
Yu Watanabe
0563c5ddd9 veritysetup-generator: fix ordering of generated units
Fixes a bug introduced by 08b04ec7e72b7327b4803809732b1b8fce8dd069 and
953006dcb0a37a57aed0e762ff6289700e8689e8.

Fixes #28725.

(cherry picked from commit 685e0dd1924cce44327040b08a8980af2192bf59)
(cherry picked from commit 4bb0d3cf566eed5b11745d8c44bd788e611bbfb4)
2023-08-09 23:04:43 +01:00
Yu Watanabe
132229d87a sd-dhcp-server: propagate error on parsing DHCP packet
Otherwise, we silently ignore the received packet and that makes hard to
debug issue.

(cherry picked from commit 809da721f0167f88234e55a342e82023019e2341)
(cherry picked from commit 7483f75fa6c6487281d0f39633258902c62e8856)
2023-08-09 23:04:43 +01:00
Yu Watanabe
55a69c73df resolve: ignore nameserver= and domain= kernel command line options without value
Otherwise, manager_parse_dns_server_string_and_warn() or
manager_parse_search_domains_and_warn() will trigger assertion.

(cherry picked from commit 91acee9906e973365109b1b1d5e880ced9aeae65)
(cherry picked from commit 08c1aff48304eb2772c0cb2e6b9ad438608996eb)
2023-08-09 23:04:43 +01:00
mordner
6b1a3e05d0 man: fix typo in journalctl
(cherry picked from commit 653c90ec0e6f4d68b68938a20bd8cff492e7a666)
(cherry picked from commit b4b4caf09f2826266fbe70d0de1c6276f2670bd7)
2023-08-09 23:04:43 +01:00
Fabian Vogt
23b5306412 units/initrd-parse-etc.service: Conflict with emergency.target
If emergency.target is started while initrd-parse-etc.service/start is queued,
the initrd-parse-etc job did not get canceled. In parallel to the emergency
units, it eventually runs the service, which starts initrd-cleanup.service,
which in turn isolates initrd-switch-root.target. This stops the emergency
units and effectively starts the initrd boot process again, which likely
fails again like the initial attempt. The system is thus stuck in an endless
loop, never really reaching emergency.target.

With this conflict added, starting emergency.target automatically cancels
initrd-parse-etc.service/start, avoiding the loop.

(cherry picked from commit 327cd2d3db703555f8d572b4cd055fbe55e1068b)
(cherry picked from commit 72da03631ae175dfa852c2cdedcdd8e9215c1d4f)
2023-08-09 23:04:43 +01:00
Ronan Pigott
7ca3cae97b zsh: reintroduce pattern argument to uncached verbs
The systemctl completion previously made use of PREFIX as a pattern
argument to list-unit-files and list-units. This had the problem of
erroneously filtering the results that were stored in the cache, and
erroneously filtering results that might have been requested according
to the users configuration (e.g. _correct completer, certain
matcher-lists or tag-orders, etc.).

Unfortunately, the runtime of list-unit-files increases when no pattern
argument is provided, and systemctl show, used to filter those units,
can become unacceptably slow when provided with too many units to
describe.

Let's re-introduce the pattern argument to list-unit-files and
list-units where necessary in order to alleviate these bottlenecks
without poisining the cache. A 'use-pattern' style is introduced that
may be used to disable this behavior if it is undesired. We can still
expect that certain completions, like `systemctl start <TAB>` will be
slow, like before. To fix this we will need systemd to learn a more
efficient way of filtering the units than parsing systemctl show.

(cherry picked from commit 2cbda74862049be2003496c7d432341d53a0fdf9)
(cherry picked from commit dfc0445cb86e500732125da9f758092641a4c5a2)
2023-08-09 23:04:43 +01:00
Ronan Pigott
f664081482 zsh: use sys_really_all_units for non-template names
The systemctl invocations used for these completions match the ones used
for the _sys_really_all_units parameter, so we should really just use
the cached parameter rather than recomputing the result.

(cherry picked from commit c8e2cd79c155151bcdb983eedd24a6a77082c41b)
(cherry picked from commit 9814972198a11591bbb10dfb99e9d50a4bed055b)
2023-08-09 23:04:43 +01:00
Daan De Meyer
a99dfdca88 test-user-util: Drop tty check in gid_to_name() test
The tty user is not guaranteed to exist, so let's remove the dependency
from the test.

(cherry picked from commit a1fedc613fe90b9f1f253fd02a7a6575351a27cc)
(cherry picked from commit 865f0d6e76bcfbf880986b4b08c54baf9354e8a6)
2023-08-09 23:04:43 +01:00
Daan De Meyer
d0a3467f47 tmpfiles: Consider ENOPKG as information not available
We already handle the case where /etc/machine-id is empty. Let's make
sure we also handle the case where /etc/machine-id is "uninitialized".

(cherry picked from commit 5dd814d7cd88b9d58c7c5bd79fb27ee2b22e82a3)
(cherry picked from commit faaa0ee5e94dc4121954f1e63e7affdc97eee7e0)
2023-08-09 23:04:43 +01:00
Luca Boccassi
8f3ec30c46 portablectl: fix regression when using --force without extension parameters
c18f4eb9e96836a made it possible to use --force with various verbs, by
going through the newer D-Bus methods. Except it didn't, as it regressed
during PR review refactorings, and nobody noticed because there were no
tests for it. Fix it, and add tests.

Follow-up for c18f4eb9e96836a6a8285ec42fd8a34c8909f6d9

(cherry picked from commit bdfa3f3a5c6d16d56d432e7bc52be0c03a5ce6ad)
(cherry picked from commit 0f27d7b9f9cda1aa4e0d56cabd517e9a95026cf2)
2023-08-09 23:04:43 +01:00
Mike Yuan
4d79082c00 man/systemd.unit: DefaultTimeoutStartSec= -> DefaultDeviceTimeoutSec=
for device unit job timeouts

Follow-up for #24044

(cherry picked from commit 83d373d213cad0f67c85055bf342d36cef8ed8e6)
(cherry picked from commit a5e5d6d64e7f9fb1fa245c5cabddd2d1dcccfcaf)
2023-08-09 23:04:43 +01:00
Antonio Alvarez Feijoo
af6c953148 man/systemd-fsck@.service: clarify passno and noauto combination in /etc/fstab
Fixes #28657

(cherry picked from commit 000680a68dbdb07d77807868df0b4f978180e4cd)
(cherry picked from commit 9c1b5911af27193bf92780dc231fe523cecf4c24)
2023-08-09 23:04:43 +01:00
Khem Raj
af9df5f778 include missing sys/file.h for LOCK_EX
(cherry picked from commit ac8db36cbc26694ee94beecc8dca208ec4b5fd45)
(cherry picked from commit 6b03b53bcc140b36e0f0124946253ba9cda9a566)
2023-08-09 23:04:43 +01:00
Khem Raj
78186b11d0 test/test-sizeof: Include sys/timex.h for struct timex
Fixes

../git/src/test/test-sizeof.c:64:41: error: incomplete definition of type 'struct timex'
   64 |         check(typeof(((struct timex *)0)->freq), SIZEOF_TIMEX_MEMBER);
      |                      ~~~~~~~~~~~~~~~~~~~^

(cherry picked from commit e6456caf7676329abe861e9381f1957794baeabc)
(cherry picked from commit de249cefe9878ed4b6dfe33628462b1f44e8d513)
2023-08-09 23:04:43 +01:00