about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2022-12-22 22:55:09 +0800
committerGitHub <noreply@github.com>2022-12-22 22:55:09 +0800
commit6686dee8342ec534ab3f0bec6136d6fdf90f5c23 (patch)
tree07e1a0f251450477cc59dcbc7ce4306199137f12
parented048367cccb074e1c470a5120b9208b48fc004f (diff)
parentf44f4260358cea96e4c3e7ca386da5bda35a0438 (diff)
Merge pull request #206658 from SamLukeYes/arch-install-scripts
arch-install-scripts: avoid using setuid wrappers
-rw-r--r--pkgs/tools/misc/arch-install-scripts/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/misc/arch-install-scripts/default.nix b/pkgs/tools/misc/arch-install-scripts/default.nix
index caaf298c2f94e..50510512dc9c7 100644
--- a/pkgs/tools/misc/arch-install-scripts/default.nix
+++ b/pkgs/tools/misc/arch-install-scripts/default.nix
@@ -68,8 +68,9 @@ resholve.mkDerivation rec {
 
       # TODO: no good way to resolve mount/umount in Nix builds for now
       # see https://github.com/abathur/resholve/issues/29
-      fake = {
-        external = [ "mount" "umount" ];
+      fix = {
+        mount = true;
+        umount = true;
       };
 
       keep = [ "$setup" "$pid_unshare" "$mount_unshare" "${pacman}/bin/pacman" ];