diff options
author | Ricardo M. Correia <rcorreia@wizy.org> | 2017-01-19 14:10:03 +0100 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2017-02-12 02:48:57 +0200 |
commit | 123cbd40c244c84a1caebce9082aa3704be7f57c (patch) | |
tree | b09e52dca629448440bf3a8fb4c47af578311e95 /nixos/modules/system | |
parent | c19b17d14ff25a86bc4b563999bfa3569344d16a (diff) |
raspberryPi boot loader: don't remove xx-initrd files
The Raspberry Pi boot loader was deleting all xx-initrd text files (which simply contain the path to the actual initrd files) just after having created them. The code was actually trying to delete real, obsolete initrd files, which are named <hash>-initrd-initrd (after path cleaning), but the glob was catching the other files as well.
Diffstat (limited to 'nixos/modules/system')
-rw-r--r-- | nixos/modules/system/boot/loader/raspberrypi/builder.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder.sh b/nixos/modules/system/boot/loader/raspberrypi/builder.sh index 1a02bf231709a..f627d093eafb9 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/builder.sh +++ b/nixos/modules/system/boot/loader/raspberrypi/builder.sh @@ -115,7 +115,7 @@ copyForced $fwdir/start_db.elf /boot/start_db.elf copyForced $fwdir/start_x.elf /boot/start_x.elf # Remove obsolete files from /boot and /boot/old. -for fn in /boot/old/*linux* /boot/old/*initrd* /boot/bcm*.dtb; do +for fn in /boot/old/*linux* /boot/old/*initrd-initrd* /boot/bcm*.dtb; do if ! test "${filesCopied[$fn]}" = 1; then rm -vf -- "$fn" fi |