mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-23 06:03:40 +00:00
c9183d3738
The ConditionFileNotEmpty override patch wasn't correct for stage1, which does have the modules in /lib. So, remove the patch and set the right path with overrides in the final system. Also, make sure systemd-tmpfiles-setup-dev is pulled in to create all the necessary symlinks.
23 lines
737 B
Diff
23 lines
737 B
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 | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
|
|
index 745d01ff50..dd4eef45c3 100644
|
|
--- a/src/fsck/fsck.c
|
|
+++ b/src/fsck/fsck.c
|
|
@@ -368,7 +368,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";
|
|
|