summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-03-20 16:58:31 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-03-20 16:58:31 +0000
commitc598932f0a65ae9ca78a91e1015fe5638539be75 (patch)
tree2343c497f0e71238a0291088e4f4b0d864a8f4eb /perl-install
parent586fa375f90a241fc3cadfd1760982492b62e020 (diff)
downloaddrakx-c598932f0a65ae9ca78a91e1015fe5638539be75.tar
drakx-c598932f0a65ae9ca78a91e1015fe5638539be75.tar.gz
drakx-c598932f0a65ae9ca78a91e1015fe5638539be75.tar.bz2
drakx-c598932f0a65ae9ca78a91e1015fe5638539be75.tar.xz
drakx-c598932f0a65ae9ca78a91e1015fe5638539be75.zip
- when reformatting swap, keep existing UUID (#38877)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/fs/format.pm2
-rw-r--r--perl-install/install/NEWS1
3 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index a6fccb8e2..3fbb34ff8 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,8 @@
- drakfont:
o fix importing fonts without chkfontpath (#37604)
o stop restarting XFS server
+- diskdrake:
+ o keep existing swap UUID (#38877)
- partitioning wizard: do not show error message in wizard mode when
cancel is clicked (clean wizard window instead)
diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm
index 6757cf0ea..90f6cc89a 100644
--- a/perl-install/fs/format.pm
+++ b/perl-install/fs/format.pm
@@ -96,6 +96,8 @@ sub part_raw {
push @options, '-l', "Untitled";
} elsif (isAppleBootstrap($part)) {
push @options, '-l', 'bootstrap';
+ } elsif ($fs_type eq 'swap') {
+ push @options, '-U', $part->{device_UUID} if $part->{device_UUID};
}
if ($part->{device_LABEL}) {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index c008c0aba..0c9bb640a 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- when reformatting swap, keep existing UUID (#38877)
- ask which drive to install bootloader if we don't really know which is first
bios drive (cf #38829)
- fix reading alternatives in install