diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2020-06-10 23:32:06 -0400 |
|---|---|---|
| committer | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2020-06-11 14:41:18 -0400 |
| commit | 476c8e0754968cc0d56479894ea5c3037dd70892 (patch) | |
| tree | 73713b0c8c1970ea4ae63d58a2a77935857edfc4 /nixos/modules/installer | |
| parent | 34caab71bbd2ae342c65667cc999a3be8a1ad336 (diff) | |
| download | nixpkgs-476c8e0754968cc0d56479894ea5c3037dd70892.tar nixpkgs-476c8e0754968cc0d56479894ea5c3037dd70892.tar.gz nixpkgs-476c8e0754968cc0d56479894ea5c3037dd70892.tar.bz2 nixpkgs-476c8e0754968cc0d56479894ea5c3037dd70892.tar.lz nixpkgs-476c8e0754968cc0d56479894ea5c3037dd70892.tar.xz nixpkgs-476c8e0754968cc0d56479894ea5c3037dd70892.tar.zst nixpkgs-476c8e0754968cc0d56479894ea5c3037dd70892.zip | |
sd-image-raspberrypi4: mount boot partition
This should have been done initially, as otherwise it gets awfully awkward to boot into new generations by default. This system-specific image wasn't expected to be long-lived, thus why it didn't end up being polished much. Reality shows us we may be stuck with it for a bit longer, so let's make it easier to use for new users.
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix index c545a1e7e24..79c835dc390 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix @@ -18,6 +18,7 @@ sdImage = { firmwareSize = 128; + firmwarePartitionName = "NIXOS_BOOT"; # This is a hack to avoid replicating config.txt from boot.loader.raspberryPi populateFirmwareCommands = "${config.system.build.installBootLoader} ${config.system.build.toplevel} -d ./firmware"; @@ -25,6 +26,12 @@ populateRootCommands = ""; }; + fileSystems."/boot/firmware" = { + # This effectively "renames" the loaOf entry set in sd-image.nix + mountPoint = "/boot"; + neededForBoot = true; + }; + # the installation media is also the installation target, # so we don't want to provide the installation configuration.nix. installer.cloneConfig = false; |