From 123cbd40c244c84a1caebce9082aa3704be7f57c Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 19 Jan 2017 14:10:03 +0100 Subject: [PATCH] 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 -initrd-initrd (after path cleaning), but the glob was catching the other files as well. --- nixos/modules/system/boot/loader/raspberrypi/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder.sh b/nixos/modules/system/boot/loader/raspberrypi/builder.sh index 1a02bf23170..f627d093eaf 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