firejail: 0.9.76 -> 0.9.80 (#521058)
This commit is contained in:
@@ -1,27 +0,0 @@
|
||||
--- a/src/firejail/fs_overlayfs.c
|
||||
+++ b/src/firejail/fs_overlayfs.c
|
||||
@@ -327,6 +327,16 @@
|
||||
errExit("mounting /dev");
|
||||
fs_logger("whitelist /dev");
|
||||
|
||||
+ // mount-bind /nix
|
||||
+ if (arg_debug)
|
||||
+ printf("Mounting /nix\n");
|
||||
+ char *nix;
|
||||
+ if (asprintf(&nix, "%s/nix", oroot) == -1)
|
||||
+ errExit("asprintf");
|
||||
+ if (mount("/nix", nix, NULL, MS_BIND|MS_REC, NULL) < 0)
|
||||
+ errExit("mounting /nix");
|
||||
+ fs_logger("whitelist /nix");
|
||||
+
|
||||
// mount-bind run directory
|
||||
if (arg_debug)
|
||||
printf("Mounting /run\n");
|
||||
@@ -384,6 +394,7 @@
|
||||
free(odiff);
|
||||
free(owork);
|
||||
free(dev);
|
||||
+ free(nix);
|
||||
free(run);
|
||||
free(tmp);
|
||||
}
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "firejail";
|
||||
version = "0.9.76";
|
||||
version = "0.9.80";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netblue30";
|
||||
repo = "firejail";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-0zb5olSuXOHeRj4dqeevubedjqOuDnUEBQaD/vOj2CM=";
|
||||
sha256 = "sha256-rw1hNX8QFy5UFDx4vaYiiWV+hy7ji6XY6eEPvieGQoM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -34,10 +34,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Adds the /nix directory when using an overlay.
|
||||
# Required to run any programs under this mode.
|
||||
./mount-nix-dir-on-overlay.patch
|
||||
|
||||
# By default fbuilder hardcodes the firejail binary to the install path.
|
||||
# On NixOS the firejail binary is a setuid wrapper available in $PATH.
|
||||
./fbuilder-call-firejail-on-path.patch
|
||||
|
||||
Reference in New Issue
Block a user