From beb01f006a795fa1c3d46ca2a7a3dd199d919b0b Mon Sep 17 00:00:00 2001
From: Travis Staton <tstaton@mercury.com>
Date: Mon, 11 Nov 2024 11:36:56 -0500
Subject: [PATCH] add firmware-partition-label option

---
 rpi/default.nix       |  7 ++++++-
 sd-image/sd-image.nix | 18 ++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/rpi/default.nix b/rpi/default.nix
index 339d3f0..70d9509 100644
--- a/rpi/default.nix
+++ b/rpi/default.nix
@@ -26,6 +26,11 @@ in
           without the _defconfig part.
         '';
       };
+      firmware-partition-label = mkOption {
+        default = "FIRMWARE";
+        type = types.str;
+        description = "label of rpi firmware partition";
+      };
       pin-inputs = {
         enable = mkOption {
           default = true;
@@ -94,7 +99,7 @@ in
             {
               Type = "oneshot";
               MountImages =
-                "/dev/disk/by-label/FIRMWARE:${firmware-path}";
+                "/dev/disk/by-label/${cfg.firmware-partition-label}:${firmware-path}";
               StateDirectory = "raspberrypi-firmware";
               ExecStart = pkgs.writeShellScript "migrate-rpi-firmware" ''
                 shopt -s nullglob
diff --git a/sd-image/sd-image.nix b/sd-image/sd-image.nix
index 9ca69d8..60eedfc 100644
--- a/sd-image/sd-image.nix
+++ b/sd-image/sd-image.nix
@@ -30,7 +30,8 @@ let
   } // optionalAttrs (config.sdImage.rootPartitionUUID != null) {
     uuid = config.sdImage.rootPartitionUUID;
   });
-in {
+in
+{
   imports = [ ];
 
   options.sdImage = {
@@ -82,14 +83,6 @@ in {
       '';
     };
 
-    firmwarePartitionName = mkOption {
-      type = types.str;
-      default = "FIRMWARE";
-      description = ''
-        Name of the filesystem which holds the boot firmware.
-      '';
-    };
-
     rootPartitionUUID = mkOption {
       type = types.nullOr types.str;
       default = null;
@@ -160,7 +153,7 @@ in {
   config = {
     fileSystems = {
       "/boot/firmware" = {
-        device = "/dev/disk/by-label/${config.sdImage.firmwarePartitionName}";
+        device = "/dev/disk/by-label/${config.raspberry-pi-nix.firmware-partition-label}";
         fsType = "vfat";
       };
       "/" = {
@@ -226,7 +219,7 @@ in {
             # Create a FAT32 /boot/firmware partition of suitable size into firmware_part.img
             eval $(partx $img -o START,SECTORS --nr 1 --pairs)
             truncate -s $((SECTORS * 512)) firmware_part.img
-            faketime "1970-01-01 00:00:00" mkfs.vfat -i ${config.sdImage.firmwarePartitionID} -n ${config.sdImage.firmwarePartitionName} firmware_part.img
+            faketime "1970-01-01 00:00:00" mkfs.vfat -i ${config.sdImage.firmwarePartitionID} -n ${config.raspberry-pi-nix.firmware-partition-label} firmware_part.img
 
             # Populate the files intended for /boot/firmware
             mkdir firmware
@@ -244,7 +237,8 @@ in {
                 zstd -T$NIX_BUILD_CORES --rm $img
             fi
           '';
-        }) { };
+        })
+      { };
 
     boot.postBootCommands = lib.mkIf config.sdImage.expandOnBoot ''
       # On the first boot do some maintenance tasks