base-files: correctly split install-key function for APK
[openwrt/openwrt.git] / target / linux / ipq806x / patches-5.10 / 102-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch
1 From 5001f2e1a325b68dbf225bd17f69a4d3d975cca5 Mon Sep 17 00:00:00 2001
2 From: John Crispin <john@phrozen.org>
3 Date: Thu, 9 Mar 2017 09:31:44 +0100
4 Subject: [PATCH 61/69] mtd: "rootfs" conflicts with OpenWrt auto mounting
5
6 Signed-off-by: John Crispin <john@phrozen.org>
7 ---
8 drivers/mtd/parsers/qcomsmempart.c | 4 ++++
9 1 file changed, 4 insertions(+)
10
11 --- a/drivers/mtd/parsers/qcomsmempart.c
12 +++ b/drivers/mtd/parsers/qcomsmempart.c
13 @@ -132,6 +132,11 @@ static int parse_qcomsmem_part(struct mt
14 parts[i].offset = le32_to_cpu(pentry->offset) * mtd->erasesize;
15 parts[i].mask_flags = pentry->attr;
16 parts[i].size = le32_to_cpu(pentry->length) * mtd->erasesize;
17 +
18 + /* "rootfs" conflicts with OpenWrt auto mounting */
19 + if (mtd_type_is_nand(mtd) && !strcmp(name, "rootfs"))
20 + parts[i].name = "ubi";
21 +
22 pr_debug("%d: %s offs=0x%08x size=0x%08x attr:0x%08x\n",
23 i, pentry->name, le32_to_cpu(pentry->offset),
24 le32_to_cpu(pentry->length), pentry->attr);