summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2017-11-27 10:20:34 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-05-28 11:44:24 +0100
commit4121e603d4da4d614ba5b1afb3b994e805be5b65 (patch)
treecc22f25a4c5a463ffdbb7c763116b7594bf87971
parent10c3fd004acec3e01b3de5100d04875ba35cae91 (diff)
downloaddrakx-4121e603d4da4d614ba5b1afb3b994e805be5b65.tar
drakx-4121e603d4da4d614ba5b1afb3b994e805be5b65.tar.gz
drakx-4121e603d4da4d614ba5b1afb3b994e805be5b65.tar.bz2
drakx-4121e603d4da4d614ba5b1afb3b994e805be5b65.tar.xz
drakx-4121e603d4da4d614ba5b1afb3b994e805be5b65.zip
Make fs::get_major_minor() unconditionally read the device numbers.
Thus ensuring we get the correct device numbers after writing a partition table (mga#22032). (cherry picked from commit eb497cece2871e59a2f981602e44f303826ffeab)
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/fs.pm2
-rw-r--r--perl-install/install/NEWS3
3 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index c41fdac83..b1050b589 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -5,6 +5,9 @@
(mga#21263, mga#21250)
o Fix drakboot video mode selection when using grub2 (mga#21246)
o Fix parsing of grub2 menu entries to support 16-bit mode (mga#21247).
+- diskdrake:
+ o ensure device major/minor numbers are reread after writing the
+ partition table (mga#22032)
- iwlwifi-agn-ucode is renamed to iwlwifi-firmware (mga#22316)
- update list of modules needing firmware
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index ac118cdc0..76cce10e7 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -144,7 +144,7 @@ sub get_major_minor {
eval {
my (undef, $major, $minor) = devices::entry($_->{device});
($_->{major}, $_->{minor}) = ($major, $minor);
- } if !$_->{major};
+ };
}
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 24a359459..5b718dbe5 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- diskdrake:
+ o ensure device major/minor numbers are reread after writing the
+ partition table (mga#22032)
- fix perl escaping causing commands to not get linked
- do not include some hwdb files from uneeded pkgs
- bootloader: