Make sure cmdline-provided partitions override anything that is
on the disk.
Signed-off-by: Michał Mirosław <mirq-linux@xxxxxxxxxxxx>
---
block/partitions/check.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/block/partitions/check.c b/block/partitions/check.c
index ffe408fead0c..f0b6454b7767 100644
--- a/block/partitions/check.c
+++ b/block/partitions/check.c
@@ -40,6 +40,13 @@
int warn_no_part = 1; /*This is ugly: should make genhd removable media aware*/
static int (*check_part[])(struct parsed_partitions *) = {
+ /*
+ * Let cmdline override whatever there is on disk.
+ */
+#ifdef CONFIG_CMDLINE_PARTITION
+ cmdline_partition,
+#endif
+
/*
* Probe partition formats with tables at disk address 0
* that also have an ADFS boot block at 0xdc0.
@@ -67,9 +74,6 @@ static int (*check_part[])(struct parsed_partitions *) = {
adfspart_check_ADFS,
#endif
-#ifdef CONFIG_CMDLINE_PARTITION
- cmdline_partition,
-#endif
#ifdef CONFIG_EFI_PARTITION
efi_partition, /* this must come before msdos */
#endif
--
2.20.1
