3 files changed, 15 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 6c5f76cc4..5c638af04 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
 - diskdrake:
   o forget the changed label when the user cancels
+  o fix preserving UUID when formatting ext* and swap, and handle more FS (#39913)
 - localedrake:
   o set scim-thai as default IM for Thai
 - drakboot:
diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm
index 4a2b31405..6a7a0856b 100644
--- a/perl-install/fs/format.pm
+++ b/perl-install/fs/format.pm
@@ -151,8 +151,13 @@ sub part_raw {
         push @options, '-l', "Untitled";
     } elsif (isAppleBootstrap($part)) {
 	push @options, '-l', 'bootstrap';
-    } elsif (member($fs_type, 'swap', 'ext2', 'ext3', 'ext4')) {
+    }
+
+    # Preserve UUID
+    if (member($fs_type, 'swap', 'ext2', 'ext3', 'ext4')) {
 	push @options, '-U', $part->{device_UUID} if $part->{device_UUID};
+    } elsif ($fs_type eq 'reiserfs') {
+	push @options, '-u', $part->{device_UUID} if $part->{device_UUID};
     }
 
     if ($part->{device_LABEL}) {
@@ -169,6 +174,13 @@ sub part_raw {
 	run_program::raw({ timeout => 'never' }, @args) or die N("%s formatting of %s failed", $fs_type, $dev);
     }
 
+    # Preserve UUID on fs where we couldn't enforce it while formatting
+    if ($fs_type eq 'jfs') {
+	run_program::raw('jfs_tune', '-U', devices::make($dev));
+    } elsif ($fs_type eq 'xfs') {
+	run_program::raw('xfs_admin', '-U', devices::make($dev));
+    } 
+    
     if (member($fs_type, qw(ext3 ext4))) {
 	disable_forced_fsck($dev);
     }
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 94db177a3..a26257ae2 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
 - when installing to a removable device, put boot sector there, else
   put it into first non removable drive (#47106)
+- fix preserving UUID when formatting ext* and swap, and handle more FS (#39913)
 
 Version 11.83 - 6 February 2009