nix-community/raspberry-pi-nix
1
0
Fork 0
mirror of https://github.com/nix-community/raspberry-pi-nix.git synced 2025-11-08 11:36:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

disable sd-image

Browse source
This commit is contained in:
Travis Staton 2024-10-03 18:39:26 -04:00
parent db08995cd6
commit d039a262ce
No known key found for this signature in database
GPG key ID: E883E53CDAC16260
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
flake.nix
View file

@ -53,15 +53,18 @@
core = import ./overlays (builtins.removeAttrs srcs [ "self" ]);
libcamera = import ./overlays/libcamera.nix (builtins.removeAttrs srcs [ "self" ]);
};
nixosModules.raspberry-pi = import ./rpi {
inherit pinned;
core-overlay = self.overlays.core;
libcamera-overlay = self.overlays.libcamera;
nixosModules = {
raspberry-pi = import ./rpi {
inherit pinned;
core-overlay = self.overlays.core;
libcamera-overlay = self.overlays.libcamera;
};
sd-image = import ./sd-image;
};
nixosConfigurations = {
rpi-example = srcs.nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
modules = [ self.nixosModules.raspberry-pi ./example ];
modules = [ self.nixosModules.raspberry-pi self.nixosModules.sd-image ./example ];
};
};
checks.aarch64-linux = self.packages.aarch64-linux;

8
rpi/default.nix
View file

@ -8,7 +8,7 @@ let
kernel = pkgs.rpi-kernels."${version}"."${board}";
in
{
imports = [ ../sd-image ./config.nix ./i2c.nix ];
imports = [ ./config.nix ./i2c.nix ];
options = with lib; {
raspberry-pi-nix = {
@ -93,7 +93,7 @@ in
{
Type = "oneshot";
MountImages =
"/dev/disk/by-label/${config.sdImage.firmwarePartitionName}:${firmware-path}";
"/dev/disk/by-label/FIRMWARE:${firmware-path}";
StateDirectory = "raspberrypi-firmware";
ExecStart = pkgs.writeShellScript "migrate-rpi-firmware" ''
shopt -s nullglob
@ -308,8 +308,8 @@ in
# table, so the partition table id is a 1-indexed hex
# number. So, we drop the hex prefix and stick on a "02" to
# refer to the root partition.
"root=PARTUUID=${lib.strings.removePrefix "0x" config.sdImage.firmwarePartitionID}-02"
"rootfstype=ext4"
# "root=PARTUUID=${lib.strings.removePrefix "0x" config.sdImage.firmwarePartitionID}-02"
# "rootfstype=ext4"
"fsck.repair=yes"
"rootwait"
"init=/sbin/init"