cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

sd-image: remove unnecessary subshell

Browse source 
replace the subshell surrounding this block with cd before and after

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Martin Schwaighofer 2022-08-21 19:15:20 +02:00
parent bacef6bb09
commit 0c67f190b1
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/installer/sd-card/sd-image.nix
View file

@ -233,14 +233,15 @@ in
find firmware -exec touch --date=2000-01-01 {} + find firmware -exec touch --date=2000-01-01 {} +
# Copy the populated /boot/firmware into the SD image # Copy the populated /boot/firmware into the SD image
(cd firmware; cd firmware
# Force a fixed order in mcopy for better determinism, and avoid file globbing # Force a fixed order in mcopy for better determinism, and avoid file globbing
for d in $(find . -type d -mindepth 1 | sort); do for d in $(find . -type d -mindepth 1 | sort); do
faketime "2000-01-01 00:00:00" mmd -i ../firmware_part.img "::/$d" faketime "2000-01-01 00:00:00" mmd -i ../firmware_part.img "::/$d"
done done
for f in $(find . -type f | sort); do for f in $(find . -type f | sort); do
mcopy -pvm -i ../firmware_part.img "$f" "::/$f" mcopy -pvm -i ../firmware_part.img "$f" "::/$f"
done) done
cd ..
# Verify the FAT partition before copying it. # Verify the FAT partition before copying it.
fsck.vfat -vn firmware_part.img fsck.vfat -vn firmware_part.img