summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-06-24 00:01:53 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-06-24 00:56:42 +0200
commita8a8c3e978deba5f5a20b70ce7b871b68562ce15 (patch)
tree0e1fb56773ddc788547b975d9a7f6b0927bfcf6a
parentf403c342c192e96b9765ca5a039ab2d8efb94208 (diff)
downloaddrakx-a8a8c3e978deba5f5a20b70ce7b871b68562ce15.tar
drakx-a8a8c3e978deba5f5a20b70ce7b871b68562ce15.tar.gz
drakx-a8a8c3e978deba5f5a20b70ce7b871b68562ce15.tar.bz2
drakx-a8a8c3e978deba5f5a20b70ce7b871b68562ce15.tar.xz
drakx-a8a8c3e978deba5f5a20b70ce7b871b68562ce15.zip
fix preserving UUID when formating jfs/nilfs/xfs
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/fs/format.pm2
-rw-r--r--perl-install/install/NEWS2
3 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index c6f31fa35..508ba7c55 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- diskdrake:
+ o fix preserving UUID when formating jfs/nilfs/xfs
- drakboot:
o do not offer to pick the disk where to install grub2 on UEFI
diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm
index 72e2504e1..f1efb8448 100644
--- a/perl-install/fs/format.pm
+++ b/perl-install/fs/format.pm
@@ -196,7 +196,7 @@ sub part_raw {
# Preserve UUID on fs where we couldn't enforce it while formatting
if (my $uuid_cmd = $preserve_UUID{$fs_type}) {
(undef, $cmd) = @$uuid_cmd;
- run_program::raw({}, $cmd, '-U', devices::make($dev)) if $cmd;
+ run_program::raw({}, $cmd, '-U', $part->{device_UUID}, devices::make($dev)) if $cmd;
}
if (member($fs_type, qw(ext3 ext4))) {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 620db9118..f6a26c1ef 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -3,6 +3,8 @@
- logs:
o fix found kernel names
o log if were running under UEFI
+- partionning:
+ o fix preserving UUID when formating jfs/nilfs/xfs
- summary:
o sort service categories, putting "Other" at end (mga#6286)