Revert "base-files: handle name collision between kernel UBI volume and MTD partition"

This reverts commit eef8c718b474aff652b42c2e96b55b1b310f7f56.
Wrong Signed-off-by line was used, reverting and re-applying.

Signed-off-by: Paul Spooren <mail@aparcar.org>

diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh
index 4bf9fc993eff5386faa769a772aaffb24703991e..e4a255b9c0ec53e75020c97b007e82d2491e1b5a 100644 (file)
--- a/package/base-files/files/lib/upgrade/nand.sh
+++ b/package/base-files/files/lib/upgrade/nand.sh
@@ -328,10 +328,6 @@ nand_upgrade_tar() {
        local rootfs_type
        [ "$rootfs_length" ] && rootfs_type="$(identify_tar "$tar_file" "$cmd" "$board_dir/root")"
 
-       # If CI_SKIP_KERNEL_MTD is set, ignore any potential kernel MTD partition that was found.
-       # This is needed if there's an MTD partition with the same name as the kernel's UBI volume.
-       [ "${CI_SKIP_KERNEL_MTD:-}" ] && kernel_mtd=
-
        local ubi_kernel_length
        if [ "$kernel_length" ]; then
                if [ "$kernel_mtd" ]; then