colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #216826 from gdamjan/systemd-253

Browse Source 
systemd: 252.5 -> 253
This commit is contained in:
Florian Klink 2023-03-13 17:37:39 +01:00 committed by GitHub
commit 504d66bae9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 76 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/doc/manual/release-notes/rl-2305.section.md
View File

@ -12,6 +12,10 @@ In addition to numerous new and upgraded packages, this release has the followin
- default linux: 5.15 -\> 6.1, all supported kernels available
- systemd has been updated to v253.1, see [the pull request](https://github.com/NixOS/nixpkgs/pull/216826) for more info.
It's recommended to use `nixos-rebuild boot` and `reboot`, rather than `nixos-rebuild switch` - since in some rare cases
the switch of a live system might fail.
- Cinnamon has been updated to 5.6, see [the pull request](https://github.com/NixOS/nixpkgs/pull/201328#issue-1449910204) for what is changed.
- KDE Plasma has been updated to v5.27, see [the release notes](https://kde.org/announcements/plasma/5/5.27.0/) for what is changed.

2
nixos/modules/system/boot/systemd.nix
View File

@ -79,6 +79,8 @@ let
# Filesystems.
"systemd-fsck@.service"
"systemd-fsck-root.service"
"systemd-growfs@.service"
"systemd-growfs-root.service"
"systemd-remount-fs.service"
"systemd-pstore.service"
"local-fs.target"

2
nixos/modules/system/boot/systemd/initrd.nix
View File

@ -56,6 +56,7 @@ let
"systemd-ask-password-console.path"
"systemd-ask-password-console.service"
"systemd-fsck@.service"
"systemd-growfs@.service"
"systemd-halt.service"
"systemd-hibernate-resume@.service"
"systemd-journald-audit.socket"
@ -371,6 +372,7 @@ in {
managerEnvironment.PATH = "/bin:/sbin";
contents = {
"/tmp/.keep".text = "systemd requires the /tmp mount point in the initrd cpio archive";
"/init".source = "${cfg.package}/lib/systemd/systemd";
"/etc/systemd/system".source = stage1Units;

8
pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
View File

@ -12,10 +12,10 @@ https://github.com/NixOS/nixos/issues/126
2 files changed, 4 insertions(+)
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index f683f05981..5a04c2c2a6 100644
index 164e71a150..68e0766594 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -40,6 +40,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) {
@@ -41,6 +41,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) {
/* Don't bother with the OS data itself */
if (PATH_IN_SET(mount,
"/",
@ -25,10 +25,10 @@ index f683f05981..5a04c2c2a6 100644
"/etc"))
return true;
diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
index e650b82170..5d0d41aa28 100644
index 61bd9d2601..a6243da417 100644
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
@@ -522,6 +522,8 @@ static int delete_md(MountPoint *m) {
@@ -531,6 +531,8 @@ static int delete_md(MountPoint *m) {
static bool nonunmountable_path(const char *path) {
return path_equal(path, "/")

6
pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
View File

@ -10,10 +10,10 @@ container, so checking early whether it exists will fail.
1 file changed, 2 insertions(+)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 01a67b5553..86dd2cea84 100644
index 36d336dfc8..d62c5173ca 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -5636,6 +5636,7 @@ static int run(int argc, char *argv[]) {
@@ -5634,6 +5634,7 @@ static int run(int argc, char *argv[]) {
goto finish;
}
} else {
@ -21,7 +21,7 @@ index 01a67b5553..86dd2cea84 100644
_cleanup_free_ char *p = NULL;
if (arg_pivot_root_new)
@@ -5650,6 +5651,7 @@ static int run(int argc, char *argv[]) {
@@ -5648,6 +5649,7 @@ static int run(int argc, char *argv[]) {
"Directory %s doesn't look like it has an OS tree (/usr/ directory is missing). Refusing.", arg_directory);
goto finish;
}

6
pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
View File

@ -8,10 +8,10 @@ Subject: [PATCH] Look for fsck in the right place
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 73c76fceea..d00cea7158 100644
index e25c5d5efa..26f4e5669e 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -352,6 +352,7 @@ static int run(int argc, char *argv[]) {
@@ -351,6 +351,7 @@ static int run(int argc, char *argv[]) {
if (r == 0) {
char dash_c[STRLEN("-C") + DECIMAL_STR_MAX(int) + 1];
int progress_socket = -1;
@ -19,7 +19,7 @@ index 73c76fceea..d00cea7158 100644
const char *cmdline[9];
int i = 0;
@@ -372,7 +373,10 @@ static int run(int argc, char *argv[]) {
@@ -371,7 +372,10 @@ static int run(int argc, char *argv[]) {
} else
dash_c[0] = 0;

2
pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch
View File

@ -14,7 +14,7 @@ Also, remove /usr and /lib as these don't exist on NixOS.
2 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c
index 36f386254b..a968d28dfc 100644
index c99e9d8786..b9f85d1f8c 100644
--- a/src/basic/path-lookup.c
+++ b/src/basic/path-lookup.c
@@ -92,11 +92,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) {

4
pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch
View File

@ -13,10 +13,10 @@ in containers.
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/core/manager.c b/src/core/manager.c
index a59afafb58..d9e7d77913 100644
index 7b394794b0..50d092042c 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1432,7 +1432,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {
@@ -1437,7 +1437,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {
if (!unit_is_bound_by_inactive(u, &culprit))
continue;

2
pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch → pkgs/os-specific/linux/systemd/0007-Fix-hwdb-paths.patch
View File

@ -9,7 +9,7 @@ Patch by vcunat.
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/libsystemd/sd-hwdb/hwdb-internal.h b/src/libsystemd/sd-hwdb/hwdb-internal.h
index 62d27f7b89..87318e041b 100644
index 5302679a62..c681f3a984 100644
--- a/src/libsystemd/sd-hwdb/hwdb-internal.h
+++ b/src/libsystemd/sd-hwdb/hwdb-internal.h
@@ -83,8 +83,5 @@ struct trie_value_entry2_f {

105
pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch
View File

@ -1,105 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 6 Dec 2015 14:26:36 +0100
Subject: [PATCH] hostnamed, localed, timedated: disable methods that change
system settings.
---
src/hostname/hostnamed.c | 6 ++++++
src/locale/localed.c | 9 +++++++++
src/timedate/timedated.c | 10 ++++++++++
3 files changed, 25 insertions(+)
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 486b093062..580e933f14 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -906,6 +906,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
if (r < 0)
return r;
+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
+ "Changing system settings via systemd is not supported on NixOS.");
+
name = empty_to_null(name);
context_read_etc_hostname(c);
@@ -969,6 +972,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
if (r < 0)
return r;
+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
+ "Changing system settings via systemd is not supported on NixOS.");
+
name = empty_to_null(name);
context_read_machine_info(c);
diff --git a/src/locale/localed.c b/src/locale/localed.c
index 7aa47f18c2..0a8ef68931 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -309,6 +309,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
if (r < 0)
return r;
+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
+ "Changing system settings via systemd is not supported on NixOS.");
+
use_localegen = locale_gen_check_available();
/* If single locale without variable name is provided, then we assume it is LANG=. */
@@ -423,6 +426,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro
if (r < 0)
return r;
+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
+ "Changing system settings via systemd is not supported on NixOS.");
+
keymap = empty_to_null(keymap);
keymap_toggle = empty_to_null(keymap_toggle);
@@ -602,6 +608,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err
if (r < 0)
return r;
+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
+ "Changing system settings via systemd is not supported on NixOS.");
+
layout = empty_to_null(layout);
model = empty_to_null(model);
variant = empty_to_null(variant);
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 373574cc06..6dbf73eb42 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -665,6 +665,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
if (r < 0)
return r;
+ if (getenv("NIXOS_STATIC_TIMEZONE"))
+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
+ "Changing timezone via systemd is not supported when it is set in NixOS configuration.");
+
if (!timezone_is_valid(z, LOG_DEBUG))
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z);
@@ -743,6 +747,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error
if (r < 0)
return r;
+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
+ "Changing system settings via systemd is not supported on NixOS.");
+
if (lrtc == c->local_rtc && !fix_system)
return sd_bus_reply_method_return(m, NULL);
@@ -923,6 +930,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
if (r < 0)
return r;
+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
+ "Changing system settings via systemd is not supported on NixOS.");
+
r = context_update_ntp_status(c, bus, m);
if (r < 0)
return r;

20
pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch → pkgs/os-specific/linux/systemd/0008-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
View File

@ -35,10 +35,10 @@ index e486474c44..5f373d0723 100644
<literal>Etc/UTC</literal>. The resulting link should lead to the
corresponding binary
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 71b2f67350..465f1c0b15 100644
index b700f364ef..116b1cec63 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -1280,7 +1280,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) {
@@ -1282,7 +1282,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) {
assert(ret);
@ -47,7 +47,7 @@ index 71b2f67350..465f1c0b15 100644
if (!f)
return -errno;
@@ -1319,7 +1319,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) {
@@ -1321,7 +1321,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) {
_cleanup_strv_free_ char **zones = NULL;
int r;
@ -56,7 +56,7 @@ index 71b2f67350..465f1c0b15 100644
if (!f)
return -errno;
@@ -1431,7 +1431,7 @@ int verify_timezone(const char *name, int log_level) {
@@ -1433,7 +1433,7 @@ int verify_timezone(const char *name, int log_level) {
if (p - name >= PATH_MAX)
return -ENAMETOOLONG;
@ -65,7 +65,7 @@ index 71b2f67350..465f1c0b15 100644
fd = open(t, O_RDONLY|O_CLOEXEC);
if (fd < 0)
@@ -1489,7 +1489,7 @@ int get_timezone(char **ret) {
@@ -1491,7 +1491,7 @@ int get_timezone(char **ret) {
if (r < 0)
return r; /* returns EINVAL if not a symlink */
@ -75,10 +75,10 @@ index 71b2f67350..465f1c0b15 100644
return -EINVAL;
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 065ee896cd..1b260416c8 100644
index 9e79f84691..1a1c75718c 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -510,7 +510,7 @@ static int process_timezone(void) {
@@ -512,7 +512,7 @@ static int process_timezone(void) {
if (isempty(arg_timezone))
return 0;
@ -88,10 +88,10 @@ index 065ee896cd..1b260416c8 100644
(void) mkdir_parents(etc_localtime, 0755);
r = symlink_atomic(e, etc_localtime);
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 86dd2cea84..4e5f03669d 100644
index d62c5173ca..84beac064b 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1905,8 +1905,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
@@ -1915,8 +1915,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
static const char *timezone_from_path(const char *path) {
return PATH_STARTSWITH_SET(
path,
@ -103,7 +103,7 @@ index 86dd2cea84..4e5f03669d 100644
static bool etc_writable(void) {
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 6dbf73eb42..a36dd459d2 100644
index ad483301ef..a7f22b1c86 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -282,7 +282,7 @@ static int context_read_data(Context *c) {

4
pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch → pkgs/os-specific/linux/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch
View File

@ -10,10 +10,10 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index c23f1fa3f6..ad2eba82ad 100644
index fb83881cc7..c47a33134a 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -299,7 +299,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {
@@ -297,7 +297,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {
} state = NONE, look_for;
int r;

4
pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch → pkgs/os-specific/linux/systemd/0010-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
View File

@ -8,10 +8,10 @@ Subject: [PATCH] build: don't create statedir and don't touch prefixdir
1 file changed, 3 deletions(-)
diff --git a/meson.build b/meson.build
index 76ad51d3fb..839dcef437 100644
index bfc86857d6..84e3e4c1db 100644
--- a/meson.build
+++ b/meson.build
@@ -4067,9 +4067,6 @@ install_data('LICENSE.GPL2',
@@ -4277,9 +4277,6 @@ install_data('LICENSE.GPL2',
install_subdir('LICENSES',
install_dir : docdir)

12
pkgs/os-specific/linux/systemd/0012-add-rootprefix-to-lookup-dir-paths.patch → pkgs/os-specific/linux/systemd/0011-add-rootprefix-to-lookup-dir-paths.patch
View File

@ -8,14 +8,14 @@ discovery default udev rules. By adding `$out/lib` to the lookup paths
we should again be able to discover the udev rules amongst other default
files that I might have missed.
---
src/basic/def.h | 6 ++++--
src/basic/constants.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/basic/def.h b/src/basic/def.h
index 2b4de29021..1bd61dc45f 100644
--- a/src/basic/def.h
+++ b/src/basic/def.h
@@ -44,13 +44,15 @@
diff --git a/src/basic/constants.h b/src/basic/constants.h
index 5d68cc6332..a2ccc315e1 100644
--- a/src/basic/constants.h
+++ b/src/basic/constants.h
@@ -73,13 +73,15 @@
"/run/" n "\0" \
"/usr/local/lib/" n "\0" \
"/usr/lib/" n "\0" \

4
pkgs/os-specific/linux/systemd/0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch → pkgs/os-specific/linux/systemd/0012-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
View File

@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
1 file changed, 1 insertion(+)
diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
index dcee0f9006..24b03d6948 100644
index 42111d2772..53467ac229 100644
--- a/src/shutdown/shutdown.c
+++ b/src/shutdown/shutdown.c
@@ -334,6 +334,7 @@ static void init_watchdog(void) {
@@ -335,6 +335,7 @@ static void init_watchdog(void) {
int main(int argc, char *argv[]) {
static const char* const dirs[] = {
SYSTEM_SHUTDOWN_PATH,

2
pkgs/os-specific/linux/systemd/0014-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch → pkgs/os-specific/linux/systemd/0013-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
View File

@ -9,7 +9,7 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
1 file changed, 1 insertion(+)
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 3461d3e45f..d7d0ec2a7a 100644
index 9c51a3367f..75d6b76a87 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -184,6 +184,7 @@ static int execute(

2
pkgs/os-specific/linux/systemd/0015-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch → pkgs/os-specific/linux/systemd/0014-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
View File

@ -10,7 +10,7 @@ systemd itself uses extensively.
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index 22d3632e6e..1e8bbb242b 100644
index 56f01f41d8..f9b8627388 100644
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -24,11 +24,11 @@

0
pkgs/os-specific/linux/systemd/0016-pkg-config-derive-prefix-from-prefix.patch → pkgs/os-specific/linux/systemd/0015-pkg-config-derive-prefix-from-prefix.patch
View File

4
pkgs/os-specific/linux/systemd/0017-inherit-systemd-environment-when-calling-generators.patch → pkgs/os-specific/linux/systemd/0016-inherit-systemd-environment-when-calling-generators.patch
View File

@ -16,10 +16,10 @@ executables that are being called from managers.
1 file changed, 8 insertions(+)
diff --git a/src/core/manager.c b/src/core/manager.c
index d9e7d77913..ba3ce14bf0 100644
index 50d092042c..898f9ed2f1 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -3693,9 +3693,17 @@ static int build_generator_environment(Manager *m, char ***ret) {
@@ -3714,9 +3714,17 @@ static int build_generator_environment(Manager *m, char ***ret) {
* adjust generated units to that. Let's pass down some bits of information that are easy for us to
* determine (but a bit harder for generator scripts to determine), as environment variables. */

4
pkgs/os-specific/linux/systemd/0018-core-don-t-taint-on-unmerged-usr.patch → pkgs/os-specific/linux/systemd/0017-core-don-t-taint-on-unmerged-usr.patch
View File

@ -17,10 +17,10 @@ See also: https://github.com/systemd/systemd/issues/24191
1 file changed, 4 deletions(-)
diff --git a/src/core/manager.c b/src/core/manager.c
index ba3ce14bf0..03bf66ff74 100644
index 898f9ed2f1..5040d5b105 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -4493,10 +4493,6 @@ char* manager_taint_string(const Manager *m) {
@@ -4543,10 +4543,6 @@ char* manager_taint_string(const Manager *m) {
if (m->taint_usr)
stage[n++] = "split-usr";

11
pkgs/os-specific/linux/systemd/0019-tpm2_context_init-fix-driver-name-checking.patch → pkgs/os-specific/linux/systemd/0018-tpm2_context_init-fix-driver-name-checking.patch
View File

@ -1,4 +1,4 @@
From 236e9281cb158be3191c500524fbc5f397a25e03 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sun, 15 Jan 2023 20:15:55 +0800
Subject: [PATCH] tpm2_context_init: fix driver name checking
@ -27,10 +27,10 @@ filename_is_valid with path_is_valid.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c
index ba8dfb041d..7de5d5fc77 100644
index 259f280e0f..142e70a740 100644
--- a/src/shared/tpm2-util.c
+++ b/src/shared/tpm2-util.c
@@ -192,7 +192,7 @@ int tpm2_context_init(const char *device, struct tpm2_context *ret) {
@@ -176,7 +176,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) {
fn = strjoina("libtss2-tcti-", driver, ".so.0");
/* Better safe than sorry, let's refuse strings that cannot possibly be valid driver early, before going to disk. */
@ -38,7 +38,4 @@ index ba8dfb041d..7de5d5fc77 100644
+ if (!path_is_valid(fn))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "TPM2 driver name '%s' not valid, refusing.", driver);
dl = dlopen(fn, RTLD_NOW);
--
2.39.0
context->tcti_dl = dlopen(fn, RTLD_NOW);

39
pkgs/os-specific/linux/systemd/default.nix
View File

@ -139,13 +139,13 @@ assert withHomed -> withPam;
let
wantCurl = withRemote || withImportd;
wantGcrypt = withResolved || withImportd;
version = "252.5";
version = "253.1";
# Bump this variable on every (major) version change. See below (in the meson options list) for why.
# command:
# $ curl -s https://api.github.com/repos/systemd/systemd/releases/latest | \
# jq '.created_at|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime'
releaseTimestamp = "1667246393";
releaseTimestamp = "1676488940";
in
stdenv.mkDerivation (finalAttrs: {
inherit pname version;
@ -156,7 +156,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "systemd";
repo = "systemd-stable";
rev = "v${version}";
hash = "sha256-cNZRTuYFMR1z6KpELeQoJahMhRl4fKuRuc3xXH3KzlM=";
hash = "sha256-PyAhkLxDkT5gVocCXh8bst6PBgguASjnA82xinQOtjw=";
};
# On major changes, or when otherwise required, you *must* reformat the patches,
@ -171,19 +171,18 @@ stdenv.mkDerivation (finalAttrs: {
./0004-Look-for-fsck-in-the-right-place.patch
./0005-Add-some-NixOS-specific-unit-directories.patch
./0006-Get-rid-of-a-useless-message-in-user-sessions.patch
./0007-hostnamed-localed-timedated-disable-methods-that-cha.patch
./0008-Fix-hwdb-paths.patch
./0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
./0010-localectl-use-etc-X11-xkb-for-list-x11.patch
./0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
./0012-add-rootprefix-to-lookup-dir-paths.patch
./0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
./0014-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
./0015-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
./0016-pkg-config-derive-prefix-from-prefix.patch
./0017-inherit-systemd-environment-when-calling-generators.patch
./0018-core-don-t-taint-on-unmerged-usr.patch
./0019-tpm2_context_init-fix-driver-name-checking.patch
./0007-Fix-hwdb-paths.patch
./0008-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
./0009-localectl-use-etc-X11-xkb-for-list-x11.patch
./0010-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
./0011-add-rootprefix-to-lookup-dir-paths.patch
./0012-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
./0013-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
./0014-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
./0015-pkg-config-derive-prefix-from-prefix.patch
./0016-inherit-systemd-environment-when-calling-generators.patch
./0017-core-don-t-taint-on-unmerged-usr.patch
./0018-tpm2_context_init-fix-driver-name-checking.patch
] ++ lib.optional stdenv.hostPlatform.isMusl (
let
oe-core = fetchzip {
@ -301,6 +300,9 @@ stdenv.mkDerivation (finalAttrs: {
# inspect-elf support
{ name = "libelf.so.1"; pkg = opt withCoredump elfutils; }
{ name = "libdw.so.1"; pkg = opt withCoredump elfutils; }
# Support for PKCS#11 in systemd-cryptsetup, systemd-cryptenroll and systemd-homed
{ name = "libp11-kit.so.0"; pkg = opt (withHomed || withCryptsetup) p11-kit; }
];
patchDlOpen = dl:
@ -408,7 +410,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional withPCRE2 pcre2
++ lib.optional withSelinux libselinux
++ lib.optional withRemote libmicrohttpd
++ lib.optionals withHomed [ p11-kit ]
++ lib.optionals (withHomed || withCryptsetup) [ p11-kit ]
++ lib.optionals (withHomed || withCryptsetup) [ libfido2 ]
++ lib.optionals withLibBPF [ libbpf ]
++ lib.optional withTpm2Tss tpm2-tss
@ -508,6 +510,9 @@ stdenv.mkDerivation (finalAttrs: {
# more frequent development builds
"-Dman=true"
# Temporary disable the ukify tool. see https://github.com/NixOS/nixpkgs/pull/216826#issuecomment-1465228824
"-Dukify=false"
"-Defi=${lib.boolToString withEfi}"
"-Dgnu-efi=${lib.boolToString withEfi}"
] ++ lib.optionals withEfi [