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

Merge pull request #69865 from AmineChikhaoui/sd-image-compression

Browse Source 
sdImage: add option to enable bzip2 compression
This commit is contained in:
Samuel Dionne-Riel 2019-09-30 17:52:01 -04:00 committed by GitHub
commit ece3eba422
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2003.xml
View File

@ -73,7 +73,7 @@
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para /> <para>SD images are now compressed by default using <literal>bzip2</literal>.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</section> </section>

19
nixos/modules/installer/cd-dvd/sd-image.nix
View File

@ -98,6 +98,16 @@ in
populate the ./files/boot (/boot) directory. populate the ./files/boot (/boot) directory.
''; '';
}; };
compressImage = mkOption {
type = types.bool;
default = true;
description = ''
Whether the SD image should be compressed using
<command>bzip2</command>.
'';
};
}; };
config = { config = {
@ -118,10 +128,12 @@ in
sdImage.storePaths = [ config.system.build.toplevel ]; sdImage.storePaths = [ config.system.build.toplevel ];
system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, mtools, libfaketime, utillinux }: stdenv.mkDerivation { system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, mtools, libfaketime, utillinux, bzip2 }: stdenv.mkDerivation {
name = config.sdImage.imageName; name = config.sdImage.imageName;
nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux ]; nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux bzip2 ];
inherit (config.sdImage) compressImage;
buildCommand = '' buildCommand = ''
mkdir -p $out/nix-support $out/sd-image mkdir -p $out/nix-support $out/sd-image
@ -168,6 +180,9 @@ in
# Verify the FAT partition before copying it. # Verify the FAT partition before copying it.
fsck.vfat -vn firmware_part.img fsck.vfat -vn firmware_part.img
dd conv=notrunc if=firmware_part.img of=$img seek=$START count=$SECTORS dd conv=notrunc if=firmware_part.img of=$img seek=$START count=$SECTORS
if test -n "$compressImage"; then
bzip2 $img
fi
''; '';
}) {}; }) {};