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

sd-image-raspberrypi4: mount boot partition

Browse Source 
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.
This commit is contained in:
Samuel Dionne-Riel 2020-06-10 23:32:06 -04:00
parent 34caab71bb
commit 476c8e0754
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@
sdImage = { sdImage = {
firmwareSize = 128; firmwareSize = 128;
firmwarePartitionName = "NIXOS_BOOT";
# This is a hack to avoid replicating config.txt from boot.loader.raspberryPi # This is a hack to avoid replicating config.txt from boot.loader.raspberryPi
populateFirmwareCommands = populateFirmwareCommands =
"${config.system.build.installBootLoader} ${config.system.build.toplevel} -d ./firmware"; "${config.system.build.installBootLoader} ${config.system.build.toplevel} -d ./firmware";
@ -25,6 +26,12 @@
populateRootCommands = ""; 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, # the installation media is also the installation target,
# so we don't want to provide the installation configuration.nix. # so we don't want to provide the installation configuration.nix.
installer.cloneConfig = false; installer.cloneConfig = false;