Unverified Commit 18cb69fb authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

Merge pull request #330069 from rhelmot/freebsd-14.1 

freebsd: 14.0 -> 14.1
parents cc6bdf03 43fb06aa

pkgs/os-specific/bsd/freebsd/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
  generateSplicesForMkScope,

  callPackage,

  attributePathToSplice ? [ "freebsd" ],

  branch ? "release/14.0.0",

  branch ? "release/14.1.0",

}:



let

pkgs/os-specific/bsd/freebsd/patches/14.1/fsck-path.patch

0 → 100644
+18 −0
Original line number Diff line number Diff line 
diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c

index 3757ed062ba5..584ada116386 100644

--- a/sbin/fsck/fsck.c

+++ b/sbin/fsck/fsck.c

@@ -375,11 +375,8 @@ checkfs(const char *pvfstype, const char *spec, const char *mntpt,

 			_exit(0);

 

 		/* Go find an executable. */

-		execvP(execbase, _PATH_SYSPATH, __DECONST(char * const *, argv));

-		if (spec)

-			warn("exec %s for %s in %s", execbase, spec, _PATH_SYSPATH);

-		else

-			warn("exec %s in %s", execbase, _PATH_SYSPATH);

+		execvp(execbase, __DECONST(char * const *, argv));

+		warn("exec %s not found", execbase);

 		_exit(1);

 		/* NOTREACHED */