diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-29 08:12:56 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-29 08:12:56 +0100 |
| commit | 9db2421d1f65beb38911e8133349193db0042a1d (patch) | |
| tree | 90a2f4a56cf871c74aad86138d85e9631c2c2f86 /nixos/modules/installer | |
| parent | 9caab8ff4a1ad36fbc0ab866f1b0f7c15d35ba90 (diff) | |
| parent | 8d88e4f6c7b09fe811d92b346e5eafefe07a47c9 (diff) | |
| download | nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.gz nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.bz2 nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.lz nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.xz nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.zst nixlib-9db2421d1f65beb38911e8133349193db0042a1d.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/sd-image.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index b6e1d11c2b54..69746a8e9799 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -134,7 +134,9 @@ in ${config.sdImage.populateBootCommands} # Copy the populated /boot into the SD image - (cd boot; mcopy -bpsvm -i ../bootpart.img ./* ::) + (cd boot; mcopy -psvm -i ../bootpart.img ./* ::) + # Verify the FAT partition before copying it. + fsck.vfat -vn bootpart.img dd conv=notrunc if=bootpart.img of=$img seek=$START count=$SECTORS ''; }) {}; |