about summary refs log tree commit diff
path: root/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
diff options
context:
space:
mode:
authorSamuel Dionne-Riel <samuel@dionne-riel.com>2019-06-01 18:03:44 -0400
committerSamuel Dionne-Riel <samuel@dionne-riel.com>2019-06-16 17:47:30 -0400
commit6e9e78b61869bcec02055a0210e8ac569be9f881 (patch)
tree853d196aec04f7b8dee440847aff4ffe9fa59f30 /nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
parent7815c86c104a99417db844791dcda34fe7a7965f (diff)
downloadnixlib-6e9e78b61869bcec02055a0210e8ac569be9f881.tar
nixlib-6e9e78b61869bcec02055a0210e8ac569be9f881.tar.gz
nixlib-6e9e78b61869bcec02055a0210e8ac569be9f881.tar.bz2
nixlib-6e9e78b61869bcec02055a0210e8ac569be9f881.tar.lz
nixlib-6e9e78b61869bcec02055a0210e8ac569be9f881.tar.xz
nixlib-6e9e78b61869bcec02055a0210e8ac569be9f881.tar.zst
nixlib-6e9e78b61869bcec02055a0210e8ac569be9f881.zip
sd-image: Moves `/boot` into rootfs
The current FAT32 partition is kept as it is required for the Raspberry
Pi family of hardware. It is where the firmware is kept.

The partition is kept bootable, and the boot files kept in there until
the following commits, to keep all commits of this series individually
bootable.
Diffstat (limited to 'nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix')
-rw-r--r--nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
index 96e06670694e..de3385290d28 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
@@ -35,11 +35,11 @@ in
         kernel=u-boot-rpi1.bin
       '';
       in ''
-        (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/)
-        cp ${pkgs.ubootRaspberryPiZero}/u-boot.bin boot/u-boot-rpi0.bin
-        cp ${pkgs.ubootRaspberryPi}/u-boot.bin boot/u-boot-rpi1.bin
-        cp ${configTxt} boot/config.txt
-        ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot
+        (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/firmware/)
+        cp ${pkgs.ubootRaspberryPiZero}/u-boot.bin firmware/u-boot-rpi0.bin
+        cp ${pkgs.ubootRaspberryPi}/u-boot.bin firmware/u-boot-rpi1.bin
+        cp ${configTxt} firmware/config.txt
+        ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./firmware
       '';
   };
 }