VFAT boot partition bugfix (#1966)

Kernel install image is broken on VFAT images since it unmounts directory in preinstall and doesn't mount back. We used to have this for NAND / FAT install which fixes this in the postinst script. Removing since we have no more support for NAND anyway. Tested on Odroid C1. @the-going

Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
This commit is contained in:
Igor Pečovnik 2020-05-15 15:25:25 +02:00 committed by GitHub
parent 7f5927d91f
commit 528daf9deb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 11 deletions

View File

@ -128,7 +128,7 @@ index 8c4bc5a2c..30bc0cffb 100644
+cp /tmp/uImage /boot/uImage
+rm -f /$installed_image_path
+else
+ln -sf $(basename $installed_image_path) /boot/$image_name || mv /$installed_image_path /boot/$image_name
+ln -sf $(basename $installed_image_path) /boot/$image_name 2> /dev/null || mv /$installed_image_path /boot/$image_name
+fi
+touch /boot/.next
+exit 0
@ -154,7 +154,7 @@ index 8c4bc5a2c..30bc0cffb 100644
+
+bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
+if [ "\$bootfstype" = "vfat" ]; then
+umount /boot
+# we have to keep it mounted! umount /boot
+rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/$image_name /boot/uImage
+fi
+}

View File

@ -151,7 +151,7 @@ index 0b31f4f1f92c..f6b96d8507f4 100755
+ cp /tmp/uImage /boot/uImage
+ rm -f /$installed_image_path
+else
+ ln -sf $(basename $installed_image_path) /boot/$image_name || mv /$installed_image_path /boot/$image_name
+ ln -sf $(basename $installed_image_path) /boot/$image_name 2> /dev/null || mv /$installed_image_path /boot/$image_name
+fi
+touch /boot/.next
+exit 0
@ -178,7 +178,7 @@ index 0b31f4f1f92c..f6b96d8507f4 100755
+
+ bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
+ if [ "\$bootfstype" = "vfat" ]; then
+ umount /boot
+ # we have to keep it mounted! umount /boot
+ rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/$image_name /boot/uImage
+ fi
+}

View File

@ -161,7 +161,7 @@ index 6c3b038e..f4166fbe 100755
+
+bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
+if [ "\$bootfstype" = "vfat" ]; then
+umount /boot;
+# we have to keep it mounted! umount /boot
+rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/zImage /boot/uImage /boot/Image
+fi
+}

View File

@ -161,7 +161,7 @@ index 6c3b038e..f4166fbe 100755
+
+bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
+if [ "\$bootfstype" = "vfat" ]; then
+umount /boot;
+# we have to keep it mounted! umount /boot
+rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/zImage /boot/uImage /boot/Image
+fi
+}

View File

@ -154,7 +154,7 @@ index 6c3b038e..977a0624 100755
+
+bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
+if [ "\$bootfstype" = "vfat" ]; then
+umount /boot;
+# we have to keep it mounted! umount /boot
+rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/$image_name /boot/uImage
+fi
+}

View File

@ -141,7 +141,7 @@ index 0a2a7372..87edac65 100755
+
+bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
+if [ "\$bootfstype" = "vfat" ]; then
+umount /boot;
+# we have to keep it mounted! umount /boot
+rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/zImage /boot/uImage
+fi
+}

View File

@ -177,7 +177,7 @@ index c4c580f547ef..2be8a687f878 100755
+
+ bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
+ if [ "\$bootfstype" = "vfat" ]; then
+ umount /boot
+ # we have to keep it mounted! umount /boot
+ rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/$image_name /boot/uImage
+ fi
+}

View File

@ -170,7 +170,7 @@ index 6df3c9f..d33e1f3 100755
+ cp /tmp/uImage /boot/uImage
+ rm -f /$installed_image_path
+else
+ ln -sf $(basename $installed_image_path) /boot/$image_name || mv /$installed_image_path /boot/$image_name
+ ln -sf $(basename $installed_image_path) /boot/$image_name 2> /dev/null || mv /$installed_image_path /boot/$image_name
+fi
+touch /boot/.next
+exit 0
@ -199,7 +199,7 @@ index 6df3c9f..d33e1f3 100755
- create_package linux-libc-dev debian/linux-libc-dev
+ bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
+ if [ "\$bootfstype" = "vfat" ]; then
+ umount /boot
+ # we have to keep it mounted! umount /boot
+ rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/$image_name /boot/uImage
+ fi
+}