diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2010-03-31 09:36:24 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2010-03-31 09:36:24 +0000 |
| commit | d22f56232a1e1c927254f4d45359eb77ea5ccb15 (patch) | |
| tree | b575a0b6d29d90eb6da55e8718b2a82edfe19d89 | |
| parent | f8c3317b9eab539c2ba720d744cf697619f9a5a3 (diff) | |
| download | drakx-d22f56232a1e1c927254f4d45359eb77ea5ccb15.tar drakx-d22f56232a1e1c927254f4d45359eb77ea5ccb15.tar.gz drakx-d22f56232a1e1c927254f4d45359eb77ea5ccb15.tar.bz2 drakx-d22f56232a1e1c927254f4d45359eb77ea5ccb15.tar.xz drakx-d22f56232a1e1c927254f4d45359eb77ea5ccb15.zip | |
use device label even if it was not changed (#47456)
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
3 files changed, 4 insertions, 1 deletions
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 |