Merge pull request #11710 from kevincox/userenv-no-path
Remove PATH assumption from fhs-userenv.
This commit is contained in:
commit
8fb2141a69
|
@ -1,8 +1,9 @@
|
||||||
{ runCommand, lib, writeText, writeScriptBin, stdenv, ruby } :
|
{ runCommand, lib, writeText, writeScriptBin, stdenv, bash, ruby } :
|
||||||
{ env, runScript ? "bash", extraBindMounts ? [], extraInstallCommands ? "" } :
|
{ env, runScript ? "${bash}/bin/bash", extraBindMounts ? [], extraInstallCommands ? "" } :
|
||||||
|
|
||||||
let
|
let
|
||||||
name = env.pname;
|
name = env.pname;
|
||||||
|
bash' = "${bash}/bin/bash";
|
||||||
|
|
||||||
# Sandboxing script
|
# Sandboxing script
|
||||||
chroot-user = writeScriptBin "chroot-user" ''
|
chroot-user = writeScriptBin "chroot-user" ''
|
||||||
|
@ -29,7 +30,7 @@ in runCommand name {
|
||||||
runCommand "${name}-shell-env" {
|
runCommand "${name}-shell-env" {
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:$CHROOTENV_EXTRA_BINDS"
|
export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:$CHROOTENV_EXTRA_BINDS"
|
||||||
exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init "bash"} "$(pwd)"
|
exec ${chroot-user}/bin/chroot-user ${env} ${bash'} -l ${init bash'} "$(pwd)"
|
||||||
'';
|
'';
|
||||||
} ''
|
} ''
|
||||||
echo >&2 ""
|
echo >&2 ""
|
||||||
|
@ -42,7 +43,7 @@ in runCommand name {
|
||||||
cat <<EOF >$out/bin/${name}
|
cat <<EOF >$out/bin/${name}
|
||||||
#! ${stdenv.shell}
|
#! ${stdenv.shell}
|
||||||
export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:\$CHROOTENV_EXTRA_BINDS"
|
export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:\$CHROOTENV_EXTRA_BINDS"
|
||||||
exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init runScript} "\$(pwd)" "\$@"
|
exec ${chroot-user}/bin/chroot-user ${env} ${bash'} -l ${init runScript} "\$(pwd)" "\$@"
|
||||||
EOF
|
EOF
|
||||||
chmod +x $out/bin/${name}
|
chmod +x $out/bin/${name}
|
||||||
${extraInstallCommands}
|
${extraInstallCommands}
|
||||||
|
|
Loading…
Reference in a new issue