summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@gmail.com>2015-04-25 12:23:12 +0000
committerPascal Terjan <pterjan@gmail.com>2015-04-26 13:52:40 +0000
commitc460414a4abe29ab7713a08b7f626dd07c988d6e (patch)
tree40d8e21256252e1b59f06c2a1bf5775000a7aab9
parentc9deb0b888f4f2da8d85abc79fbfa70c6122ff65 (diff)
downloaddrakx-c460414a4abe29ab7713a08b7f626dd07c988d6e.tar
drakx-c460414a4abe29ab7713a08b7f626dd07c988d6e.tar.gz
drakx-c460414a4abe29ab7713a08b7f626dd07c988d6e.tar.bz2
drakx-c460414a4abe29ab7713a08b7f626dd07c988d6e.tar.xz
drakx-c460414a4abe29ab7713a08b7f626dd07c988d6e.zip
Ignore special partitions on mmc (mga#15759)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/fs/proc_partitions.pm8
-rw-r--r--perl-install/install/NEWS2
3 files changed, 10 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index d738e434d..033082dba 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- Ignore special partitions on mmc (mga#15759)
+
Version 16.88 - 25 April 2015
- ensure country/timezone locale is kept when removing unused locale
diff --git a/perl-install/fs/proc_partitions.pm b/perl-install/fs/proc_partitions.pm
index d88c231b0..f1e4cd7a2 100644
--- a/perl-install/fs/proc_partitions.pm
+++ b/perl-install/fs/proc_partitions.pm
@@ -6,8 +6,12 @@ use common;
sub read_raw() {
my (undef, undef, @all) = cat_("/proc/partitions");
grep {
- $_->{size} != 1 && # skip main extended partition
- $_->{size} != 0x3fffffff; # skip cdroms (otherwise stops cd-audios)
+ $_->{size} != 1 && # skip main extended partition
+ $_->{size} != 0x3fffffff && # skip cdroms (otherwise stops cd-audios)
+ $_->{dev} !~ /mmcblk\d+[^p]/; # only keep partitions like mmcblk0p0
+ # not mmcblk0rpmb or mmcblk0boot0 as they
+ # are not in the partition table and
+ # things will break (mga#15759)
} map {
my %l;
@l{qw(major minor size dev)} = split;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 2dd0669ed..45c3ac03c 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- Ignore special partitions on mmc (mga#15759)
+
Version 16.87 - 21 April 2015
- partitioning: