summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-03-20 18:15:12 +0000
committerThierry Vignaud <tv@mageia.org>2013-03-20 18:15:12 +0000
commit7e87f7949a82c5bc19a6be5d6eff054bfbdff866 (patch)
tree02752cf566fb09a88012a23c479303c185d56a54
parent4c4bcf31750b6177c5c22cd25cd84f4f93da30c1 (diff)
downloaddrakx-7e87f7949a82c5bc19a6be5d6eff054bfbdff866.tar
drakx-7e87f7949a82c5bc19a6be5d6eff054bfbdff866.tar.gz
drakx-7e87f7949a82c5bc19a6be5d6eff054bfbdff866.tar.bz2
drakx-7e87f7949a82c5bc19a6be5d6eff054bfbdff866.tar.xz
drakx-7e87f7949a82c5bc19a6be5d6eff054bfbdff866.zip
actually preserve UUID when formatting (mga#9428)
bug introduced in commit r252676 by pterjan on Tue Feb 10 2009: "fix preserving UUID owhen formatting ext* and swap, and handle more FS (#39913)"
-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 c3dbe1aa4..b57af50c1 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,8 @@
- bootloader-config:
o do not build initrd if no bootloader is detected and
--no-initd argument is supplied
+- diskdrake:
+ o actually preserve UUID when formatting (mga#9428)
- drakauth:
o install nss-pam-ldapd instead of nss_ldap (mga#9375)
diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm
index 8fee9d2bf..3b8c79563 100644
--- a/perl-install/fs/format.pm
+++ b/perl-install/fs/format.pm
@@ -195,7 +195,7 @@ sub part_raw {
# Preserve UUID on fs where we couldn't enforce it while formatting
(undef, $cmd) = @{$preserve_UUID{$fs_type}};
- run_program::raw($cmd, '-U', devices::make($dev)) if $cmd;
+ run_program::raw({}, $cmd, '-U', devices::make($dev)) if $cmd;
if (member($fs_type, qw(ext3 ext4))) {
disable_forced_fsck($dev);
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 747783fa0..f0ca41b28 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,8 @@
- do not disable module autoloading (mga#9428)
- authentication:
o install nss-pam-ldapd instead of nss_ldap (mga#9375)
+- partitionning:
+ o actually preserve UUID when formatting (mga#9428)
Version 15.27 - 12 March 2013