From eb497cece2871e59a2f981602e44f303826ffeab Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Mon, 27 Nov 2017 10:20:34 +0000
Subject: 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).
---
 perl-install/NEWS         | 3 +++
 perl-install/fs.pm        | 2 +-
 perl-install/install/NEWS | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index c6a33351f..cbfb21d34 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,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 6fcede4da..919cf0b76 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,7 @@
+- diskdrake:
+  o ensure device major/minor numbers are reread after writing the
+    partition table (mga#22032)
+
 Version 17.92 - 4 January 2017
 
 - fix perl escaping causing commands to not get linked
-- 
cgit v1.2.1