Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2570da807715
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1b6a4d3979f1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 28, 2018

  1. sd-image: Verifies the FAT partition before copying it. 

    This is to ensure `mtools`-based operations don't wreck the FS.
    @samueldr @dezgeg
    samueldr authored and dezgeg committed Nov 28, 2018
    Copy the full SHA
    2e5eb13 View commit details

  2. sd-image: Do not use batch operation for mcopy. 

    ```
       b      Batch mode. Optimized for huge recursive copies, but less secure if a crash happens during the copy.
```

It seems the "less secure if a crash happens" does not need a crash to
happen.

With batch mode:

```
/[...]/.
  Start (0) does not point to parent (___)
```

For pretty much everything copied in.

Without batch mode, everything passes `fsck`.

See #51150
    @samueldr @dezgeg
    samueldr authored and dezgeg committed Nov 28, 2018
    Copy the full SHA
    1b6a4d3 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 nixos/modules/installer/cd-dvd/sd-image.nix
4 changes: 3 additions & 1 deletion nixos/modules/installer/cd-dvd/sd-image.nix
View file
Original file line number Diff line number Diff line change
@@ -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
'';
}) {};