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 <colin@daedrum.net>
This commit is contained in:
parent
fc21cde24b
commit
38f37080c5
|
@ -7,6 +7,8 @@
|
||||||
, lib
|
, lib
|
||||||
# List of derivations to be included
|
# List of derivations to be included
|
||||||
, storePaths
|
, storePaths
|
||||||
|
# Whether or not to compress the resulting image with zstd
|
||||||
|
, compressImage ? false, zstd
|
||||||
# Shell commands to populate the ./files directory.
|
# Shell commands to populate the ./files directory.
|
||||||
# All files in that directory are copied to the root of the FS.
|
# All files in that directory are copied to the root of the FS.
|
||||||
, populateImageCommands ? ""
|
, populateImageCommands ? ""
|
||||||
|
@ -19,27 +21,45 @@ let
|
||||||
sdClosureInfo = pkgs.buildPackages.closureInfo { rootPaths = storePaths; };
|
sdClosureInfo = pkgs.buildPackages.closureInfo { rootPaths = storePaths; };
|
||||||
in
|
in
|
||||||
pkgs.stdenv.mkDerivation {
|
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 =
|
buildCommand =
|
||||||
''
|
''
|
||||||
|
${if compressImage then "img=temp.img" else "img=$out"}
|
||||||
|
|
||||||
set -x
|
set -x
|
||||||
(
|
(
|
||||||
mkdir -p ./files
|
mkdir -p ./files
|
||||||
${populateImageCommands}
|
${populateImageCommands}
|
||||||
)
|
)
|
||||||
|
|
||||||
mkdir -p ./files/nix/store
|
mkdir -p ./rootImage/nix/store
|
||||||
cp ${sdClosureInfo}/registration ./files/nix-path-registration
|
|
||||||
|
|
||||||
# Add the closures of the top-level store objects.
|
xargs -I % cp -a --reflink=auto % -t ./rootImage/nix/store/ < ${sdClosureInfo}/store-paths
|
||||||
for p in $(cat ${sdClosureInfo}/store-paths); do
|
(
|
||||||
echo cp -r $p "./files/nix/store"
|
GLOBIGNORE=".:.."
|
||||||
done
|
shopt -u dotglob
|
||||||
|
|
||||||
touch $out
|
for f in ./files/*; do
|
||||||
mkfs.btrfs -L ${volumeLabel} -U ${uuid} -r ./files --shrink $out
|
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
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue