From d22f56232a1e1c927254f4d45359eb77ea5ccb15 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Wed, 31 Mar 2010 09:36:24 +0000
Subject: use device label even if it was not changed (#47456)

---
 perl-install/NEWS                     | 2 ++
 perl-install/diskdrake/interactive.pm | 2 +-
 perl-install/install/NEWS             | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 1ba1db8bd..4197d5aa1 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,8 @@
 - drakxservices:
   o translate more service descriptions (#46640)
 - detect "Rack Mount" Chassis as server
+- diskdrake:
+  o use device label even if it was not changed  (#47456)
 
 Version 13.15 - 17 March 2010
 
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index b103eae2d..3f242f3ba 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -638,10 +638,10 @@ sub Label {
 		   { label => N("Label:"), val => \$new_label } ]) or return;
 
     fs::format::check_package_is_installed_label($in->do_pkgs, $part->{fs_type}) or return;
+    $part->{prefer_device_LABEL} = to_bool($part->{device_LABEL}) && !isLVM($part);
     return if $new_label eq $part->{device_LABEL};
     $part->{device_LABEL} = $new_label;
     $part->{device_LABEL_changed} = 1;
-    $part->{prefer_device_LABEL} = to_bool($part->{device_LABEL}) && !isLVM($part);
     fs::format::clean_label($part);
     fs::format::write_label($part);
 }
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 21dea12cc..c7b7e8e87 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,7 @@
 - services management:
   o translate more service descriptions (#46640)
 - detect "Rack Mount" Chassis as server
+- use device label even if it was not changed (#47456)
 
 Version 13.16 - 19 March 2010
 
-- 
cgit v1.2.1