summary refs log tree commit diff
path: root/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2020-04-30 01:03:18 +0200
committerFlorian Klink <flokli@flokli.de>2020-04-30 01:47:35 +0200
commita3082bc6b796f539cbe02bffbb058966acb629b6 (patch)
tree9995d1f4931f6811a025e06d0b073779d55c9304 /pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
parent8882516056f19f4a12fabd70084f4f246db9f30c (diff)
downloadnixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar
nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.gz
nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.bz2
nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.lz
nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.xz
nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.zst
nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.zip
systemd: regenerate patches
It seems nix is much more permissive in applying patches than git am.

These patches were regenerated by running
`git am path/to/nixpkgs/pkgs/os-specific/linux/systemd/*.patch`,
and manually running `patch -p1 < path/to/nixpkgs/pkgs/os-specific/linux/systemd/*N.patch`
where necessary.
Diffstat (limited to 'pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch')
-rw-r--r--pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
new file mode 100644
index 00000000000..3f102bd4d9b
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
@@ -0,0 +1,25 @@
+From 9cc4c2f4fd5d082aa039073a3620df536261100a 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 04/18] 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 80f7107b9d..74e48a385f 100644
+--- a/src/fsck/fsck.c
++++ b/src/fsck/fsck.c
+@@ -370,7 +370,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.26.2
+