commit fd2047c642ba44d5c300149f63f68c34da773c04 · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

nixos/lib/make-ext4-fs: fix after mkfs.ext4 refactoring

In 9ac1ab10c963a86457c2c9b1edf31542ff3737cd this library function was
refactored to use mkfs.ext4 instead of cptofs. There are two problems:

If populateImageCommands would create no files (which is fine), a cp
invocation would fail due to missing source arguments.

Another problem is that mkfs.ext4 relies on fakeroot to have sane
uid/gids in the generated filesystem image. This currently doesn't
work for cross compiling.

Julian Stecklina 5 years ago fd2047c6 ba163623

options

unified split

Changed files

+4 -1

nixos

lib

make-ext4-fs.nix

+4 -1

nixos/lib/make-ext4-fs.nix

···

       46
       46
        
             (

     

       47
       47
        
               GLOBIGNORE=".:.."

     

       48
       48
        
               shopt -u dotglob

     

       49
       49
       -
               cp -a --reflink=auto ./files/* -t ./rootImage/

     

       49
       49
       +
       

     

       50
       50
       +
               for f in ./files/*; do

     

       51
       51
       +
                   cp -a --reflink=auto -t ./rootImage/ "$f"

     

       52
       52
       +
               done

     

       50
       53
        
             )

     

       51
       54
        
       

     

       52
       55
        
             # Also include a manifest of the closures in a format suitable for nix-store --load-db