From c598932f0a65ae9ca78a91e1015fe5638539be75 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 20 Mar 2008 16:58:31 +0000
Subject: - when reformatting swap, keep existing UUID (#38877)

---
 perl-install/NEWS         | 2 ++
 perl-install/fs/format.pm | 2 ++
 perl-install/install/NEWS | 1 +
 3 files changed, 5 insertions(+)

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
-- 
cgit v1.2.1