ba770e599c
After patching, this produces exactly the same source code as in our custom fork, but having the actual patches inlined inside nixpkgs makes it easier to get rid of them. In case more complicated rebasing is necessary, maintainers can - Clone the upstream systemd/systemd[-stable] repo - Checkout the current rev mentioned in src - Apply the patches from this folder via `git am 00*.patch` - Rebase the repo on top of a new version - Export the patch series via `git format-patch $newVersion` - Update the patches = [ … ] attribute (if necessary)
26 lines
755 B
Diff
26 lines
755 B
Diff
From c841ffab8fb6174b51382b9d4334f78c74018730 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 06/27] Look for fsck in the right place
|
|
|
|
---
|
|
src/fsck/fsck.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
|
|
index 55e6544d31..3626aadda7 100644
|
|
--- a/src/fsck/fsck.c
|
|
+++ b/src/fsck/fsck.c
|
|
@@ -371,7 +371,7 @@ static int run(int argc, char *argv[]) {
|
|
} else
|
|
dash_c[0] = 0;
|
|
|
|
- cmdline[i++] = "/sbin/fsck";
|
|
+ cmdline[i++] = "/run/current-system/sw/bin/fsck";
|
|
cmdline[i++] = arg_repair;
|
|
cmdline[i++] = "-T";
|
|
|
|
--
|
|
2.24.1
|
|
|