From 288118cdfa35df235b1442ca9e535711ad7bf371 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 16 Jun 2019 17:45:48 -0400 Subject: [PATCH] sd-image: Adds removed options for removed options This will keep configuration configuring the size of the /boot partition still build, while showing the deprecation warning. In 99.9% of cases I assume ignoring the configuration is better, as the sd-image builder already is pretty opinionated in that matter. --- nixos/modules/installer/cd-dvd/sd-image.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index 5ee594b2336..0c407b19936 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -25,6 +25,11 @@ let }); in { + imports = [ + (mkRemovedOptionModule [ "sdImage" "bootPartitionID" ] "The FAT partition for SD image now only holds the Raspberry Pi firmware files. Use firmwarePartitionID to configure that partition's ID.") + (mkRemovedOptionModule [ "sdImage" "bootSize" ] "The boot files for SD image have been moved to the main ext4 partition. The FAT partition now only holds the Raspberry Pi firmware files. Changing its size may not be required.") + ]; + options.sdImage = { imageName = mkOption { default = "${config.sdImage.imageBaseName}-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.img";