public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

In 9ac1ab10c9 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.
This commit is contained in:
Julian Stecklina 2020-07-25 16:46:08 +02:00 committed by System administrator
parent ba163623ec
commit fd2047c642
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/lib/make-ext4-fs.nix
View File

@ -46,7 +46,10 @@ pkgs.stdenv.mkDerivation {
( (
GLOBIGNORE=".:.." GLOBIGNORE=".:.."
shopt -u dotglob shopt -u dotglob
cp -a --reflink=auto ./files/* -t ./rootImage/
for f in ./files/*; do
cp -a --reflink=auto -t ./rootImage/ "$f"
done
) )
# Also include a manifest of the closures in a format suitable for nix-store --load-db # Also include a manifest of the closures in a format suitable for nix-store --load-db