Merge pull request #226192 from flokli/systemd-reintroduce-config-method-disable

systemd: reintroduce "hostnamed, localed, timedated: disable methods that change system settings" patch

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

@@ -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 36d336dfc8..d62c5173ca 100644
+index a697ea5cb9..65d9e7e398 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
-@@ -5634,6 +5634,7 @@ static int run(int argc, char *argv[]) {
+@@ -5635,6 +5635,7 @@ static int run(int argc, char *argv[]) {
                                  goto finish;
                          }
                  } else {
@@ -21,7 +21,7 @@ index 36d336dfc8..d62c5173ca 100644
                          _cleanup_free_ char *p = NULL;
  
                          if (arg_pivot_root_new)
-@@ -5648,6 +5649,7 @@ static int run(int argc, char *argv[]) {
+@@ -5649,6 +5650,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;
                          }

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

@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <eelco.dolstra@logicblox.com>
-Date: Thu, 1 May 2014 14:10:10 +0200
-Subject: [PATCH] Look for fsck in the right place
-
----
- src/fsck/fsck.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
-index e25c5d5efa..26f4e5669e 100644
---- a/src/fsck/fsck.c
-+++ b/src/fsck/fsck.c
-@@ -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;
-+                _cleanup_free_ char *fsck_name = NULL;
-                 const char *cmdline[9];
-                 int i = 0;
- 
-@@ -371,7 +372,10 @@ static int run(int argc, char *argv[]) {
-                 } else
-                         dash_c[0] = 0;
- 
--                cmdline[i++] = "/sbin/fsck";
-+                r = find_executable("fsck", &fsck_name);
-+                if (r < 0)
-+                        return r;
-+                cmdline[i++] = fsck_name;
-                 cmdline[i++] =  arg_repair;
-                 cmdline[i++] = "-T";
- 

pkgs/os-specific/linux/systemd/0004-fsck-look-for-fsck-binary-not-just-in-sbin.patch

@@ -0,0 +1,152 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Florian Klink <flokli@flokli.de>
+Date: Thu, 13 Apr 2023 22:54:54 +0200
+Subject: [PATCH] fsck: look for fsck binary not just in /sbin
+
+This removes remaining hardcoded occurences of `/sbin/fsck`, and instead
+uses `find_executable` to find `fsck`.
+
+We also use `fsck_exists_for_fstype` to check for the `fsck.*`
+executable, which also checks in `$PATH`, so it's fair to assume fsck
+itself is also available.
+---
+ man/systemd-fsck@.service.xml |  8 ++++----
+ src/fsck/fsck.c               |  9 ++++++++-
+ src/home/homework-luks.c      | 11 ++++++++++-
+ src/shared/dissect-image.c    | 13 +++++++++++--
+ 4 files changed, 33 insertions(+), 8 deletions(-)
+
+diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml
+index e928aebdb3..403286829e 100644
+--- a/man/systemd-fsck@.service.xml
++++ b/man/systemd-fsck@.service.xml
+@@ -51,17 +51,17 @@
+     <para><filename>systemd-fsck</filename> does not know any details
+     about specific filesystems, and simply executes file system
+     checkers specific to each filesystem type
+-    (<filename>/sbin/fsck.<replaceable>type</replaceable></filename>). These checkers will decide if
++    (<filename>fsck.<replaceable>type</replaceable></filename>). These checkers will decide if
+     the filesystem should actually be checked based on the time since
+     last check, number of mounts, unclean unmount, etc.</para>
+ 
+     <para><filename>systemd-fsck-root.service</filename> and <filename>systemd-fsck-usr.service</filename>
+-    will activate <filename>reboot.target</filename> if <filename>/sbin/fsck</filename> returns the "System
+-    should reboot" condition, or <filename>emergency.target</filename> if <filename>/sbin/fsck</filename>
++    will activate <filename>reboot.target</filename> if <filename>fsck</filename> returns the "System
++    should reboot" condition, or <filename>emergency.target</filename> if <filename>fsck</filename>
+     returns the "Filesystem errors left uncorrected" condition.</para>
+ 
+     <para><filename>systemd-fsck@.service</filename> will fail if
+-    <filename>/sbin/fsck</filename> returns with either "System should reboot"
++    <filename>fsck</filename> returns with either "System should reboot"
+     or "Filesystem errors left uncorrected" conditions. For filesystems
+     listed in <filename>/etc/fstab</filename> without <literal>nofail</literal>
+     or <literal>noauto</literal> options, <literal>local-fs.target</literal>
+diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
+index e25c5d5efa..0e0e73c9ac 100644
+--- a/src/fsck/fsck.c
++++ b/src/fsck/fsck.c
+@@ -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;
++                _cleanup_free_ char *fsck_path = NULL;
+                 const char *cmdline[9];
+                 int i = 0;
+ 
+@@ -371,7 +372,13 @@ static int run(int argc, char *argv[]) {
+                 } else
+                         dash_c[0] = 0;
+ 
+-                cmdline[i++] = "/sbin/fsck";
++                r = find_executable("fsck", &fsck_path);
++                if (r < 0) {
++                        log_error_errno(r, "Cannot find fsck binary: %m");
++                        _exit(FSCK_OPERATIONAL_ERROR);
++                }
++
++                cmdline[i++] = fsck_path;
+                 cmdline[i++] =  arg_repair;
+                 cmdline[i++] = "-T";
+ 
+diff --git a/src/home/homework-luks.c b/src/home/homework-luks.c
+index 2ea9887853..e267457b8e 100644
+--- a/src/home/homework-luks.c
++++ b/src/home/homework-luks.c
+@@ -215,6 +215,7 @@ static int block_get_size_by_path(const char *path, uint64_t *ret) {
+ static int run_fsck(const char *node, const char *fstype) {
+         int r, exit_status;
+         pid_t fsck_pid;
++        _cleanup_free_ char *fsck_path = NULL;
+ 
+         assert(node);
+         assert(fstype);
+@@ -227,6 +228,14 @@ static int run_fsck(const char *node, const char *fstype) {
+                 return 0;
+         }
+ 
++        r = find_executable("fsck", &fsck_path);
++        /* We proceed anyway if we can't determine whether the fsck
++         * binary for some specific fstype exists,
++         * but the lack of the main fsck binary should be considered
++         * an error. */
++        if (r < 0)
++                return log_error_errno(r, "Cannot find fsck binary: %m");
++
+         r = safe_fork("(fsck)",
+                       FORK_RESET_SIGNALS|FORK_RLIMIT_NOFILE_SAFE|FORK_DEATHSIG|FORK_LOG|FORK_STDOUT_TO_STDERR|FORK_CLOSE_ALL_FDS,
+                       &fsck_pid);
+@@ -234,7 +243,7 @@ static int run_fsck(const char *node, const char *fstype) {
+                 return r;
+         if (r == 0) {
+                 /* Child */
+-                execl("/sbin/fsck", "/sbin/fsck", "-aTl", node, NULL);
++                execl(fsck_path, fsck_path, "-aTl", node, NULL);
+                 log_open();
+                 log_error_errno(errno, "Failed to execute fsck: %m");
+                 _exit(FSCK_OPERATIONAL_ERROR);
+diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
+index 4749bdd230..2b6e1418dd 100644
+--- a/src/shared/dissect-image.c
++++ b/src/shared/dissect-image.c
+@@ -1423,6 +1423,7 @@ static int is_loop_device(const char *path) {
+ static int run_fsck(int node_fd, const char *fstype) {
+         int r, exit_status;
+         pid_t pid;
++        _cleanup_free_ char *fsck_path = NULL;
+ 
+         assert(node_fd >= 0);
+         assert(fstype);
+@@ -1437,6 +1438,14 @@ static int run_fsck(int node_fd, const char *fstype) {
+                 return 0;
+         }
+ 
++        r = find_executable("fsck", &fsck_path);
++        /* We proceed anyway if we can't determine whether the fsck
++         * binary for some specific fstype exists,
++         * but the lack of the main fsck binary should be considered
++         * an error. */
++        if (r < 0)
++                return log_error_errno(r, "Cannot find fsck binary: %m");
++
+         r = safe_fork_full(
+                         "(fsck)",
+                         &node_fd, 1, /* Leave the node fd open */
+@@ -1446,7 +1455,7 @@ static int run_fsck(int node_fd, const char *fstype) {
+                 return log_debug_errno(r, "Failed to fork off fsck: %m");
+         if (r == 0) {
+                 /* Child */
+-                execl("/sbin/fsck", "/sbin/fsck", "-aT", FORMAT_PROC_FD_PATH(node_fd), NULL);
++                execl(fsck_path, fsck_path, "-aT", FORMAT_PROC_FD_PATH(node_fd), NULL);
+                 log_open();
+                 log_debug_errno(errno, "Failed to execl() fsck: %m");
+                 _exit(FSCK_OPERATIONAL_ERROR);
+@@ -1454,7 +1463,7 @@ static int run_fsck(int node_fd, const char *fstype) {
+ 
+         exit_status = wait_for_terminate_and_check("fsck", pid, 0);
+         if (exit_status < 0)
+-                return log_debug_errno(exit_status, "Failed to fork off /sbin/fsck: %m");
++                return log_debug_errno(exit_status, "Failed to fork off %s: %m", fsck_path);
+ 
+         if ((exit_status & ~FSCK_ERROR_CORRECTED) != FSCK_SUCCESS) {
+                 log_debug("fsck failed with exit status %i.", exit_status);

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

@@ -13,7 +13,7 @@ in containers.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/core/manager.c b/src/core/manager.c
-index 7b394794b0..50d092042c 100644
+index 380a4e30d7..817acb87b8 100644
 --- a/src/core/manager.c
 +++ b/src/core/manager.c
 @@ -1437,7 +1437,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {

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

@@ -0,0 +1,105 @@
+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 36ab0148b9..7d458d196d 100644
+--- a/src/hostname/hostnamed.c
++++ b/src/hostname/hostnamed.c
+@@ -1028,6 +1028,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);
+@@ -1091,6 +1094,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 841e5e3e91..a21e34430b 100644
+--- a/src/locale/localed.c
++++ b/src/locale/localed.c
+@@ -264,6 +264,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
+ 
+         use_localegen = locale_gen_check_available();
+ 
++        return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
++            "Changing system settings via systemd is not supported on NixOS.");
++
+         /* If single locale without variable name is provided, then we assume it is LANG=. */
+         if (strv_length(l) == 1 && !strchr(l[0], '=')) {
+                 if (!locale_is_valid(l[0]))
+@@ -382,6 +385,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro
+         if (r < 0)
+                 return bus_log_parse_error(r);
+ 
++        return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
++            "Changing system settings via systemd is not supported on NixOS.");
++
+         vc_context_empty_to_null(&in);
+ 
+         FOREACH_STRING(name, in.keymap ?: in.toggle, in.keymap ? in.toggle : NULL) {
+@@ -607,6 +613,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err
+         if (r < 0)
+                 return bus_log_parse_error(r);
+ 
++        return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
++            "Changing system settings via systemd is not supported on NixOS.");
++
+         x11_context_empty_to_null(&in);
+ 
+         if (!x11_context_is_safe(&in))
+diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
+index ad483301ef..31ed86955b 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;

pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch

@@ -5,14 +5,14 @@ Subject: [PATCH] Fix hwdb paths
 
 Patch by vcunat.
 ---
- src/libsystemd/sd-hwdb/hwdb-internal.h | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
+ src/libsystemd/sd-hwdb/hwdb-internal.h | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/src/libsystemd/sd-hwdb/hwdb-internal.h b/src/libsystemd/sd-hwdb/hwdb-internal.h
-index 5302679a62..c681f3a984 100644
+index 5302679a62..39e59a527f 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 {
+@@ -83,8 +83,4 @@ struct trie_value_entry2_f {
  } _packed_;
  
  #define hwdb_bin_paths                          \
@@ -22,4 +22,3 @@ index 5302679a62..c681f3a984 100644
 -        _CONF_PATHS_SPLIT_USR_NULSTR("systemd/hwdb/hwdb.bin") \
 -        UDEVLIBEXECDIR "/hwdb.bin\0"
 +        "/etc/udev/hwdb.bin\0"
-+

pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch

@@ -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 b700f364ef..116b1cec63 100644
+index 0bea149324..4b16115d43 100644
 --- a/src/basic/time-util.c
 +++ b/src/basic/time-util.c
-@@ -1282,7 +1282,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) {
+@@ -1283,7 +1283,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) {
  
          assert(ret);
  
@@ -47,7 +47,7 @@ index b700f364ef..116b1cec63 100644
          if (!f)
                  return -errno;
  
-@@ -1321,7 +1321,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) {
+@@ -1322,7 +1322,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) {
          _cleanup_strv_free_ char **zones = NULL;
          int r;
  
@@ -56,7 +56,7 @@ index b700f364ef..116b1cec63 100644
          if (!f)
                  return -errno;
  
-@@ -1433,7 +1433,7 @@ int verify_timezone(const char *name, int log_level) {
+@@ -1434,7 +1434,7 @@ int verify_timezone(const char *name, int log_level) {
          if (p - name >= PATH_MAX)
                  return -ENAMETOOLONG;
  
@@ -65,7 +65,7 @@ index b700f364ef..116b1cec63 100644
  
          fd = open(t, O_RDONLY|O_CLOEXEC);
          if (fd < 0)
-@@ -1491,7 +1491,7 @@ int get_timezone(char **ret) {
+@@ -1492,7 +1492,7 @@ int get_timezone(char **ret) {
          if (r < 0)
                  return r; /* returns EINVAL if not a symlink */
  
@@ -88,7 +88,7 @@ index 9e79f84691..1a1c75718c 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 d62c5173ca..84beac064b 100644
+index 65d9e7e398..dd44d529ca 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
 @@ -1915,8 +1915,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
@@ -103,7 +103,7 @@ index d62c5173ca..84beac064b 100644
  
  static bool etc_writable(void) {
 diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index ad483301ef..a7f22b1c86 100644
+index 31ed86955b..8db8d8c288 100644
 --- a/src/timedate/timedated.c
 +++ b/src/timedate/timedated.c
 @@ -282,7 +282,7 @@ static int context_read_data(Context *c) {

pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch

@@ -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 bfc86857d6..84e3e4c1db 100644
+index b1f5477836..1a39484855 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -4277,9 +4277,6 @@ install_data('LICENSE.GPL2',
+@@ -4278,9 +4278,6 @@ install_data('LICENSE.GPL2',
  install_subdir('LICENSES',
                 install_dir : docdir)
  

pkgs/os-specific/linux/systemd/0012-add-rootprefix-to-lookup-dir-paths.patch

@@ -12,7 +12,7 @@ files that I might have missed.
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/basic/constants.h b/src/basic/constants.h
-index 5d68cc6332..a2ccc315e1 100644
+index 5d68cc6332..33c06c1f65 100644
 --- a/src/basic/constants.h
 +++ b/src/basic/constants.h
 @@ -73,13 +73,15 @@

pkgs/os-specific/linux/systemd/0014-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch

@@ -9,10 +9,10 @@ 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 9c51a3367f..75d6b76a87 100644
+index 288fa4ae84..07deb19d7c 100644
 --- a/src/sleep/sleep.c
 +++ b/src/sleep/sleep.c
-@@ -184,6 +184,7 @@ static int execute(
+@@ -186,6 +186,7 @@ static int execute(
          };
          static const char* const dirs[] = {
                  SYSTEM_SLEEP_PATH,

pkgs/os-specific/linux/systemd/0017-inherit-systemd-environment-when-calling-generators.patch

@@ -16,7 +16,7 @@ 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 50d092042c..898f9ed2f1 100644
+index 817acb87b8..3f31359f8a 100644
 --- a/src/core/manager.c
 +++ b/src/core/manager.c
 @@ -3714,9 +3714,17 @@ static int build_generator_environment(Manager *m, char ***ret) {

pkgs/os-specific/linux/systemd/0018-core-don-t-taint-on-unmerged-usr.patch

@@ -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 898f9ed2f1..5040d5b105 100644
+index 3f31359f8a..0c4ec0b4fb 100644
 --- a/src/core/manager.c
 +++ b/src/core/manager.c
-@@ -4543,10 +4543,6 @@ char* manager_taint_string(const Manager *m) {
+@@ -4556,10 +4556,6 @@ char* manager_taint_string(const Manager *m) {
          if (m->taint_usr)
                  stage[n++] = "split-usr";
  

pkgs/os-specific/linux/systemd/0019-tpm2_context_init-fix-driver-name-checking.patch

@@ -27,7 +27,7 @@ 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 259f280e0f..142e70a740 100644
+index 4345b95106..424a334df1 100644
 --- a/src/shared/tpm2-util.c
 +++ b/src/shared/tpm2-util.c
 @@ -176,7 +176,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) {

pkgs/os-specific/linux/systemd/default.nix

@@ -169,21 +169,22 @@ stdenv.mkDerivation (finalAttrs: {
     ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch
     ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch
     ./0003-Fix-NixOS-containers.patch
-    ./0004-Look-for-fsck-in-the-right-place.patch
+    ./0004-fsck-look-for-fsck-binary-not-just-in-sbin.patch
     ./0005-Add-some-NixOS-specific-unit-directories.patch
     ./0006-Get-rid-of-a-useless-message-in-user-sessions.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
+    ./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
   ] ++ lib.optional stdenv.hostPlatform.isMusl (
     let
       oe-core = fetchzip {