mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
1199a91095
Refreshed patches. The following patches were upstreamed and have been deleted: * target/linux/lantiq/patches-4.14/0025-MIPS-lantiq-gphy-Remove-reboot-remove-reset-asserts.patch * target/linux/generic/pending-4.14/101-clocksource-mips-gic-timer-fix-clocksource-counter-w.patch * target/linux/generic/pending-4.14/103-MIPS-c-r4k-fix-data-corruption-related-to-cache-coherence.patch * target/linux/generic/pending-4.14/181-net-usb-add-lte-modem-wistron-neweb-d18q1.patch Compile-tested: ramips/mt7621, x86/64 Run-tested: ramips/mt7621 Signed-off-by: Stijn Segers <foss@volatilesystems.org>
24 lines
886 B
Diff
24 lines
886 B
Diff
From 5001f2e1a325b68dbf225bd17f69a4d3d975cca5 Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <john@phrozen.org>
|
|
Date: Thu, 9 Mar 2017 09:31:44 +0100
|
|
Subject: [PATCH 61/69] mtd: "rootfs" conflicts with OpenWrt auto mounting
|
|
|
|
Signed-off-by: John Crispin <john@phrozen.org>
|
|
---
|
|
drivers/mtd/qcom_smem_part.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
--- a/drivers/mtd/qcom_smem_part.c
|
|
+++ b/drivers/mtd/qcom_smem_part.c
|
|
@@ -189,6 +189,10 @@ static int parse_qcom_smem_partitions(st
|
|
m_part->size = le32_to_cpu(s_part->size) * (*smem_blksz);
|
|
m_part->offset = le32_to_cpu(s_part->start) * (*smem_blksz);
|
|
|
|
+ /* "rootfs" conflicts with OpenWrt auto mounting */
|
|
+ if (mtd_type_is_nand(master) && !strcmp(m_part->name, "rootfs"))
|
|
+ m_part->name = "ubi";
|
|
+
|
|
/*
|
|
* The last SMEM partition may have its size marked as
|
|
* something like 0xffffffff, which means "until the end of the
|