mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-24 14:43:37 +00:00
575fddf25b
systemd v253 changelog/NEWS: https://github.com/systemd/systemd/blob/v253/NEWS NixOS changes: 0007-hostnamed-localed-timedated-disable-methods-that-cha.patch was dropped, because systemd gained support to handle read-only /etc. *-add-rootprefix-to-lookup-dir-paths.patch required some updates too, as src/basic/def.h moved to src/basic/constants.h. systemd/systemd#25771 switched p11kit to become dlopen()'ed, so we need to patch that path. added a note to the 23.05 release notes to recommend `nixos-rebuild boot` Co-authored-by: Florian Klink <flokli@flokli.de>
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
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";
|
|
|