summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-13 08:04:56 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-13 08:04:56 +0000
commit5f223771c836b26030717a1b2cab1ae760688dd5 (patch)
treeea8c8f1eb38ca0271ed23f2dceb5816485bb74cd
parentb055a88e52b1aedcc0448fcf94efea0a4d36f9d0 (diff)
downloaddrakx-5f223771c836b26030717a1b2cab1ae760688dd5.tar
drakx-5f223771c836b26030717a1b2cab1ae760688dd5.tar.gz
drakx-5f223771c836b26030717a1b2cab1ae760688dd5.tar.bz2
drakx-5f223771c836b26030717a1b2cab1ae760688dd5.tar.xz
drakx-5f223771c836b26030717a1b2cab1ae760688dd5.zip
- fix grub hanging if /boot on xfs (#33267)
-rw-r--r--perl-install/bootloader.pm12
-rw-r--r--perl-install/install/NEWS1
2 files changed, 13 insertions, 0 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 0976f1678..60e473e86 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1642,6 +1642,17 @@ sub configure_kdm_BootManager {
)) };
}
+sub sync_partition_data_to_disk {
+ my ($part) = @_;
+
+ common::sync();
+
+ if ($part->{fs_type} eq 'xfs') {
+ run_program::rooted($::prefix, 'xfs_freeze', '-f', $part->{mntpoint});
+ run_program::rooted($::prefix, 'xfs_freeze', '-u', $part->{mntpoint});
+ }
+}
+
sub install_grub {
my ($bootloader, $all_hds) = @_;
@@ -1650,6 +1661,7 @@ sub install_grub {
if (!$::testing) {
my @files = grep { /(stage1|stage2|_stage1_5)$/ } glob("$::prefix/lib/grub/*/*");
cp_af(@files, "$::prefix/boot/grub");
+ sync_partition_data_to_disk(fs::get::root([ fs::get::fstab($all_hds) ], 'boot'));
install_raw_grub();
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 2c145b928..51dc386f9 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
- do not configure "windows" bootloader entries for "hidden" partitions
- fix unwrapped label (#33243)
+- fix grub hanging if /boot on xfs (#33267)
Version 10.4.191 - 5 September 2007, by Thierry Vignaud