commit 5897433b3173906c5cd52ba33a5a164eb3de967b · pyrox.dev/nixpkgs

+31 -17

pkgs/build-support/build-fhs-userenv/chroot-user.rb

···

       1
       1
        
       #!/usr/bin/env ruby

     

       2
       2
        
       

     

       3
       3
       -
       # Bind mounts hierarchy: [from, to (relative)]

     

       3
       3
       +
       # Bind mounts hierarchy: from => to (relative)

     

       4
       4
        
       # If 'to' is nil, path will be the same

     

       5
       5
       -
       mounts = [ ['/nix/store', nil],

     

       6
       6
       -
                  ['/dev', nil],

     

       7
       7
       -
                  ['/proc', nil],

     

       8
       8
       -
                  ['/sys', nil],

     

       9
       9
       -
                  ['/etc', 'host-etc'],

     

       10
       10
       -
                  ['/tmp', 'host-tmp'],

     

       11
       11
       -
                  ['/home', nil],

     

       12
       12
       -
                  ['/var', nil],

     

       13
       13
       -
                  ['/run', nil],

     

       14
       14
       -
                  ['/root', nil],

     

       15
       15
       -
                ]

     

       5
       5
       +
       mounts = { '/nix/store' => nil,

     

       6
       6
       +
                  '/dev' => nil,

     

       7
       7
       +
                  '/proc' => nil,

     

       8
       8
       +
                  '/sys' => nil,

     

       9
       9
       +
                  '/etc' => 'host-etc',

     

       10
       10
       +
                  '/tmp' => 'host-tmp',

     

       11
       11
       +
                  '/home' => nil,

     

       12
       12
       +
                  '/var' => nil,

     

       13
       13
       +
                  '/run' => nil,

     

       14
       14
       +
                  '/root' => nil,

     

       15
       15
       +
                }

     

       16
       16
        
       

     

       17
       17
        
       # Propagate environment variables

     

       18
       18
        
       envvars = [ 'TERM',

     
···

       65
       65
        
       swdir = Pathname.new ARGV[0]

     

       66
       66
        
       execp = ARGV.drop 1

     

       67
       67
        
       

     

       68
       68
       +
       # Populate extra mounts

     

       69
       69
       +
       if not ENV["CHROOTENV_EXTRA_BINDS"].nil?

     

       70
       70
       +
         for extra in ENV["CHROOTENV_EXTRA_BINDS"].split(':')

     

       71
       71
       +
           paths = extra.split('=')

     

       72
       72
       +
           if not paths.empty?

     

       73
       73
       +
             if paths.size <= 2

     

       74
       74
       +
               mounts[paths[0]] = paths[1]

     

       75
       75
       +
             else

     

       76
       76
       +
               $stderr.puts "Ignoring invalid entry in CHROOTENV_EXTRA_BINDS: #{extra}"

     

       77
       77
       +
             end

     

       78
       78
       +
           end

     

       79
       79
       +
         end

     

       80
       80
       +
       end

     

       81
       81
       +
       

     

       68
       82
        
       # Set destination paths for mounts

     

       69
       69
       -
       mounts.map! { |x| [x[0], x[1].nil? ? x[0].sub(/^\/*/, '') : x[1]] }

     

       83
       83
       +
       mounts = mounts.map { |k, v| [k, v.nil? ? k.sub(/^\/*/, '') : v] }.to_h

     

       70
       84
        
       

     

       71
       85
        
       # Create temporary directory for root and chdir

     

       72
       86
        
       root = Dir.mktmpdir 'chrootenv'

     
···

       97
       111
        
         write_file '/proc/self/gid_map', "#{gid} #{gid} 1"

     

       98
       112
        
       

     

       99
       113
        
         # Do rbind mounts.

     

       100
       100
       -
         mounts.each do |x|

     

       101
       101
       -
           to = "#{root}/#{x[1]}"

     

       114
       114
       +
         mounts.each do |from, rto|

     

       115
       115
       +
           to = "#{root}/#{rto}"

     

       102
       116
        
           FileUtils.mkdir_p to

     

       103
       103
       -
           $mount.call x[0], to, nil, MS_BIND | MS_REC, nil

     

       117
       117
       +
           $mount.call from, to, nil, MS_BIND | MS_REC, nil

     

       104
       118
        
         end

     

       105
       119
        
       

     

       106
       120
        
         # Chroot!

     
···

       108
       122
        
         Dir.chdir '/'

     

       109
       123
        
       

     

       110
       124
        
         # Symlink swdir hierarchy

     

       111
       111
       -
         mount_dirs = Set.new mounts.map { |x| Pathname.new x[1] }

     

       125
       125
       +
         mount_dirs = Set.new mounts.map { |_, v| Pathname.new v }

     

       112
       126
        
         link_swdir = lambda do |swdir, prefix|

     

       113
       127
        
           swdir.find do |path|

     

       114
       128
        
             rel = prefix.join path.relative_path_from(swdir)

+2 -1

pkgs/build-support/build-fhs-userenv/default.nix

···

       1
       1
       -
       { runCommand, writeText, writeScriptBin, stdenv, ruby } : { env, runScript ? "bash" } :

     

       1
       1
       +
       { runCommand, lib, writeText, writeScriptBin, stdenv, ruby } : { env, runScript ? "bash", extraBindMounts ? [] } :

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         name = env.pname;

     
···

       27
       27
        
         passthru.env =

     

       28
       28
        
           runCommand "${name}-shell-env" {

     

       29
       29
        
             shellHook = ''

     

       30
       30
       +
               export CHROOTENV_EXTRA_BINDS="${lib.makeSearchPath extraBindMounts}:$CHROOTENV_EXTRA_BINDS"

     

       30
       31
        
               exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init "bash"} "$(pwd)"

     

       31
       32
        
             '';

     

       32
       33
        
           } ''