diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2015-04-22 15:49:23 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2015-04-22 17:50:40 +0300 |
| commit | b66be2a549756ed8cd6a091d880626aa70e5f313 (patch) | |
| tree | fad7b384477a74bb6c8674b29aa0bf51a1ca6b16 /pkgs/build-support | |
| parent | 97931361d739fa2d28f5d583f594e85a8611e5a7 (diff) | |
| download | nixpkgs-b66be2a549756ed8cd6a091d880626aa70e5f313.tar nixpkgs-b66be2a549756ed8cd6a091d880626aa70e5f313.tar.gz nixpkgs-b66be2a549756ed8cd6a091d880626aa70e5f313.tar.bz2 nixpkgs-b66be2a549756ed8cd6a091d880626aa70e5f313.tar.lz nixpkgs-b66be2a549756ed8cd6a091d880626aa70e5f313.tar.xz nixpkgs-b66be2a549756ed8cd6a091d880626aa70e5f313.tar.zst nixpkgs-b66be2a549756ed8cd6a091d880626aa70e5f313.zip | |
fhs-userenv: move mounts map
Diffstat (limited to 'pkgs/build-support')
| -rwxr-xr-x | pkgs/build-support/build-fhs-userenv/chroot-user.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb index 357a743c993..2fd6a47e132 100755 --- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb +++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb @@ -11,7 +11,7 @@ mounts = [ ['/nix/store', nil], ['/var', nil], ['/run', nil], ['/root', nil], - ].map! { |x| [ x[0], x[1].nil? ? x[0].sub(/^\/*/, '') : x[1] ] } + ] # Create directories mkdirs = ['tmp', @@ -68,6 +68,9 @@ abort "Usage: chrootenv swdir program args..." unless ARGV.length >= 2 swdir = Pathname.new ARGV[0] execp = ARGV.drop 1 +# Set destination paths for mounts +mounts.map! { |x| [x[0], x[1].nil? ? x[0].sub(/^\/*/, '') : x[1]] } + # Create temporary directory for root and chdir root = Dir.mktmpdir 'chrootenv' |