From 38f37080c55027ff11c9e2ac4f34d6f46202e5d0 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 15 Sep 2023 07:45:10 +0300 Subject: [PATCH] nixos/lib/make-btrfs-fs: copy improvements from https://git.sr.ht/~c00w/nixpkgs/tree/sdimagebtrfs/item/nixos/lib/make-btrfs-fs.nix I made only one change which was to use `btrfs check` instead of `fsck.btrfs` because of this warning ``` btrfs-fs.img> ++ fsck.btrfs /nix/store/6d46rc768c140asy6rjpc5rk568r36zq-btrfs-fs.img btrfs-fs.img> If you wish to check the consistency of a BTRFS filesystem or btrfs-fs.img> repair a damaged filesystem, see btrfs(8) subcommand 'check'. ``` Co-authored-by: Colin L Rice --- nixos/lib/make-btrfs-fs.nix | 40 +++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/nixos/lib/make-btrfs-fs.nix b/nixos/lib/make-btrfs-fs.nix index fceeea8d5755..225666f9a50e 100644 --- a/nixos/lib/make-btrfs-fs.nix +++ b/nixos/lib/make-btrfs-fs.nix @@ -7,6 +7,8 @@ , lib # List of derivations to be included , storePaths +# Whether or not to compress the resulting image with zstd +, compressImage ? false, zstd # Shell commands to populate the ./files directory. # All files in that directory are copied to the root of the FS. , populateImageCommands ? "" @@ -19,27 +21,45 @@ let sdClosureInfo = pkgs.buildPackages.closureInfo { rootPaths = storePaths; }; in pkgs.stdenv.mkDerivation { - name = "btrfs-fs.img"; + name = "btrfs-fs.img${lib.optionalString compressImage ".zst"}"; - nativeBuildInputs = [ btrfs-progs ]; + nativeBuildInputs = [ btrfs-progs ] ++ lib.optional compressImage zstd; buildCommand = '' + ${if compressImage then "img=temp.img" else "img=$out"} + set -x ( mkdir -p ./files ${populateImageCommands} ) - mkdir -p ./files/nix/store - cp ${sdClosureInfo}/registration ./files/nix-path-registration + mkdir -p ./rootImage/nix/store - # Add the closures of the top-level store objects. - for p in $(cat ${sdClosureInfo}/store-paths); do - echo cp -r $p "./files/nix/store" - done + xargs -I % cp -a --reflink=auto % -t ./rootImage/nix/store/ < ${sdClosureInfo}/store-paths + ( + GLOBIGNORE=".:.." + shopt -u dotglob - touch $out - mkfs.btrfs -L ${volumeLabel} -U ${uuid} -r ./files --shrink $out + for f in ./files/*; do + cp -a --reflink=auto -t ./rootImage/ "$f" + done + ) + + cp ${sdClosureInfo}/registration ./rootImage/nix-path-registration + + touch $img + mkfs.btrfs -L ${volumeLabel} -U ${uuid} -r ./rootImage --shrink $img + + if ! btrfs check $img; then + echo "--- 'btrfs check' failed for BTRFS image ---" + return 1 + fi + + if [ ${builtins.toString compressImage} ]; then + echo "Compressing image" + zstd -v --no-progress ./$img -o $out + fi ''; }